tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,032 Commits 3 Branches 5 Tags
33e5dfb9a8eb96f49b569b34e77d6f9962c11076
Commit Graph

700 Commits

Author SHA1 Message Date
keronshb
cd78c5451d Ensnaring Component and Bola Update (#9968) 2022-08-25 00:50:31 +10:00
Nemanja
79be8258ec circuitry resprite (#10691) 2022-08-19 19:50:18 -07:00
Nemanja
2ccca5a02d Ports machine boards from shiptest (#10682) 2022-08-18 17:10:20 -07:00
Visne
906edc592d Fix/improve smokeables (#10497) 2022-08-13 22:20:31 -07:00
OctoRocket
001830b6e4 Fixed energy dagger sprite being flipped the wrong way in one frame of its animation (#10560) 2022-08-13 22:15:54 -07:00
Nemanja
1470957e7e Night At The Orchestra [All the Instruments] (#9364) 2022-08-08 12:21:54 +10:00
Kara
b947151d9a Bucket solution fills + ECS SolutionContainerVisualizer (#10289) 2022-08-07 01:50:52 -07:00
CormosLemming
e227f208bc Changes popcorn sprite to have the number fourteen instead of thirteen. (#10134) 2022-07-30 19:56:04 -07:00
Rane
e36b155325 Port boxer from Nyano (#9080) 2022-07-26 18:34:19 -07:00
TaralGit
c4dd5b676c guns (#9958) 
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2022-07-24 21:25:41 +10:00
lapatison
f94e3743b2 Centered shot glass sprite (#9986) 2022-07-23 18:47:02 -07:00
Rane
abab5bedcd Port honkbots from nyano (#9698) 2022-07-15 00:54:34 -07:00
Kara
e43915c94a Proto-kinetic accelerator (#9748) 2022-07-15 14:28:14 +10:00
Kara
ad7889e8a9 Magic staves + wands (#9070) 2022-07-14 19:45:27 -07:00
TaralGit
ccefd0caf0 RPG-7, Kardashev rifle and Hristov heavy sniper resprites (#9729) 
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2022-07-14 08:37:57 -07:00
Moony
ef6d0344de Revert "Fireaxe resprite" (#9676) 2022-07-13 10:22:31 +02:00
KIBORG04
71c8d08e4c Kvass (#9082) 
* add kvass

* nevermind

* forgot about double 's'

* Update tanks.yml

* gotovo

* Update meta.json
 2022-07-11 23:11:12 -07:00
Emisse
fb6586cdc6 Lamp Plushie (#9118) 
* Update meta.json

* Add files via upload

* Update toys.yml

* Update toy.yml

* Update toys.yml
 2022-07-10 20:13:16 -05:00
metalgearsloth
5107bc3be7 Bullet impact effects (#9530) 2022-07-09 13:46:11 +10:00
Deahaka
a7e4152171 Fireaxe resprite (#9302) 
* fieraxe

* traitor-fireaxe
 2022-07-08 20:03:20 -07:00
Nemanja
e36a4e44f5 sprite fix (#9542) 2022-07-09 04:09:27 +10:00
ChilbroBaggins
ad46c4669a Textures to make lamps mappable to East/West. (#9414) 
Co-authored-by: Jeff <velcroboy333@hotmail.com>
 2022-07-07 11:47:05 -07:00
TaralGit
f6da17d7d9 highlights (#9332) 
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2022-07-06 19:57:23 +10:00
metalgearsloth
40eecdd78a Stamina damage (#9230) 2022-07-06 18:06:12 +10:00
ninruB
3c4998649b Make the extra bright lantern actually flash you. (#9387) 
* lantern goes STUN STUN

* fix an awkward extra spacebar

* fixing the lantern as emogarbage suggested

* buffs the usage amount

ngl, 15 might be a bit over the top, but it is several times larger than a normal flash so it somewhat makes sense.

* fixed encoding
 2022-07-05 11:40:19 -07:00
Aerocrux
064e34e9c5 Fix invisible held sprites for capgun (#9390) 
* Fix capgun YAML for held sprites and touch up in-hand sprites

* Remove capgun size to inherit BaseItem size 5
 2022-07-05 10:09:54 -07:00
keronshb
d65601f024 Blocking and Shields (#8584) 
* Blocking

* Fixes Bodytype bug

* Blocking Damage Modifier

* Storing bodytype

* Consolidates Stop Blocking code

* Consolidates more methods

* Some cleanup, hitbox fix

* Shield Textures

* Passive blocking modifier check

* Localization, popups, and more cleanup

* Small cleanup

* Relay event

* Fixes a shutdown bug, adds specific containers and sets

* Popups and sounds

* Fixes typo

* Removes whitespace, adds comment

* Some requested changes

* Remove Shared

* Audio fix

* More changes

* More requested changes

* Properly remove on shutdown

* Adds riot shields to seclathes

* SecTech Riot shield

* Constant variable

* Relay transfer to user blocking system

* More destruction behavior

* Adds a shape field

* Riot shield cleanup

* More requested changes.

* Prevents blocking attempt where a user cannot be anchored

* Listen for anchor change

* Unused using cleanup

* More shields.

* Buckler

* Construction

* Linter fix
 2022-07-04 16:31:12 +10:00
Rane
e86e6a5cce Port research disks from nyano (#9081) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-29 00:41:08 +10:00
ike709
d770eb6a35 Forensics (#8451) 
* Port forensics from nyanotrasen

* port updates

* printing

* Update Resources/Locale/en-US/forensics/forensics.ftl

Co-authored-by: Veritius <veritiusgaming@gmail.com>

* Update Content.Server/Forensics/Components/ForensicPadComponent.cs

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* Update Content.Server/Forensics/Systems/ForensicPadSystem.cs

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* Update Content.Server/Forensics/Systems/ForensicScannerSystem.cs

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* partially address reviews

* comments

* redo the events

* handle it

* rewrite loc

* master fixes

Co-authored-by: ike709 <ike709@github.com>
Co-authored-by: Veritius <veritiusgaming@gmail.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2022-06-27 20:04:53 -05:00
TaralGit
8b0e8915a8 Hand made pistol replacement and inhands for ak and china lake (#9198) 
* hand made pistol replacement and inhands for ak and china lake

* china lake inhands correction

* change

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2022-06-27 19:18:01 -05:00
TaralGit
aaad270146 ak and china lake sprites replacements (#9110) 
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2022-06-25 12:59:10 +10:00
EmoGarbage404
76af659072 Space Cash Sprite Tweak (#9120) 2022-06-24 07:45:32 -07:00
Rane
a1affccc84 Miasma improvements (#9022) 2022-06-24 01:20:52 -07:00
metalgearsloth
2b6c352aff Jetpacks (#9023) 
* Movement acceleration

* tweaks

* Weightless refactor coz fuck it

* CCVars

* weightless movement tweaks

* Some cleanup while I'm here

* dorkpacks

* thanks fork

* fixes

* zoomies

* toggles

* hmm

* yamls

* b

* so true

* Effects refactor

* namespace

* review
 2022-06-24 17:44:30 +10:00
EmoGarbage404
1c7a09b736 Fire Axe [New syndie item] (#9088) 2022-06-23 18:27:28 -07:00
Kara
cc755a2051 Projectile spells + fireball spell (#9058) 
* Projectile spells + fireball spell

* say it with some gumption
 2022-06-23 03:24:50 -07:00
Morber
cbfcdde8bd Add screwdriver head sprite (#8828) 2022-06-18 13:42:15 +10:00
TaralGit
0b7d22c168 quickfix (#8942) 
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2022-06-18 13:20:16 +10:00
Emisse
e4caedf031 Station Specific Jobs: Reporter and Psychologist (#8865) 
* Update jobs.yml

* Add files via upload

* id moment

* Update identification_cards.yml

* Update pda.yml

* Add files via upload

* psych

* roleyml psych

* real

* Update jumpsuits.yml

* Add files via upload

* Add files via upload

* Add files via upload

* Update jobs.yml

* Update meta.json

* Update meta.json

* Update meta.json

* Update bagel.yml

* Update marathon.yml

* job iconz

* Update meta.json
 2022-06-16 19:28:38 +10:00
metalgearsloth
a18ba5c2b5 Power cell culling (#8814) 2022-06-16 18:37:07 +10:00
CrudeWax
c210239f45 Fishy swarmers: Carp content and Space Dragon! (#7395) 
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-06-16 14:14:06 +10:00
metalgearsloth
dfad885e82 Fix large_casing sprite and cobra mag (#8809) 2022-06-13 19:30:15 +10:00
EmoGarbage404
63fd01f3bb Zombie Rework & Polymorph Expansion (#8413) 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-06-12 15:53:13 +10:00
TaralGit
43dc0be57c Revamp guns: Revival (#8675) 
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-12 12:39:52 +10:00
ninruB
c41b001ae3 Ore bags! (YAML, RSI) (#8425) 
* Adding orebags hooray

* Adds ore bags to salvage lockers.

* no ic in ooc!!!!! (fixed typo)

i managed to type ic instead of id in the yaml file, real

* deleted the ore bags from cargodrobes, the pr lies!!!

* not 100, not 150, should be 200 next, right?

WRONG!!! 175!!!

* adds orebags to salvage spawn salvage equipment boxes
 2022-06-12 11:57:02 +10:00
Peptide90
79c265efb3 Fixes ID/Names for Sterile masks / latex gloves. Adds nitrile glove box (#8607) 
* fixes box ID/names for mask and gloves. Adds nitrile box

* map update for ID change

* crate fills fix
 2022-06-03 22:05:18 -07:00
Moony
fada213a22 Implements item pricing, and piracy. (#8548) 
* Start implementing item pricing.

* Flesh out prices a bit, add the appraisal tool.

* Add prices to more things.

* YARRRRRRR

* gives pirates an appraisal tool in their pocket.

* Makes the various traitor objectives valuable. Also nerfs the price of a living person, so it's easier to bargain for them.

* Address reviews.

* Address reviews.
 2022-06-03 10:56:11 -05:00
Emisse
c87f4ab65c Holofan Projector Upstream from Nyano (#8352) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-03 21:58:18 +10:00
Peptide90
8d9b56fce6 Goon floor pack 1 (#8267) 
* floors boxing, arcadeblue2 and carpet clown

* adds gym, metaldiamond and carpetoffice from goon

* adds variants for boxing and gym

* tile variants updated
 2022-06-02 12:10:58 +10:00
metalgearsloth
fb943a61dc Gun refactor (#8301) 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: T-Stalker <le0nel_1van@hotmail.com>
Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
 2022-06-01 19:59:58 +10:00