Commit Graph

197 Commits

Author SHA1 Message Date
QuoteFox 7fb3ed17f7 Merge pull request #755 from ArchieBeepBoop/reagentsagain
Ports reagents id removal and typepath usage
2020-12-23 17:48:37 +00:00
Archie 41f0a84a87 Fire Extinguisher Reagents 2020-12-18 01:30:17 -03:00
Lin a7c539ac32 Ports reagents id removal and typepath usage. 2020-12-09 14:32:36 -03:00
Oposshim 6e66585d13 donk boxes list 2020-12-09 12:28:39 -05:00
Oposshim cb79e145f9 box /var fix 2020-12-09 12:03:46 -05:00
Oposshim dbcfc8855c Dank.Corp
More variety + bonus sprites.
2020-12-08 00:13:31 -05:00
Dahlular 4fb6256a99 Revert "Borg expander + VTEC fix" 2020-12-06 13:44:28 -07:00
Dahlular 40b1495ff3 Merge pull request #714 from DragonTrance/borgupgrade-fix
Borg expander + VTEC fix
2020-12-06 13:22:11 -07:00
CygnusB ad8a067015 agonyyyy 2020-12-01 18:09:00 -03:00
QuoteFox 8437a3e472 Merge pull request #719 from TotallyNotADog/cleanNadeFix
fixes cleaner grenades hissing whenever they come into existence
2020-11-28 09:34:12 +00:00
Dahlular 29d35a5645 Merge pull request #721 from ArchieBeepBoop/rld
Nerfs RLDs because they hard counter nightmares and night ops.
2020-11-27 13:54:58 -07:00
Dip 4d197db9ea a 2020-11-27 16:03:45 -03:00
Dip 6057e3036e change costs 2020-11-27 16:01:59 -03:00
Ghom 6502fe255f Merge pull request #10586 from Tupinambis/RLDNerf
Nerfs RLDs because they hard counter nightmares and night ops.
2020-11-27 14:44:26 -03:00
Dahlular 238ab653c4 Merge pull request #707 from Oposshim/another-nanotrasen-muh-lore-tweak
Kinaris Corp 1.1.9
2020-11-27 07:40:04 -07:00
TotallyNotADog f9137afb8a replace glass with plastic 2020-11-25 16:01:13 -06:00
DragonTrance a297b6f05c 2 2020-11-22 14:14:50 -07:00
Dahlular fa5e05c44c Merge pull request #702 from ArchieBeepBoop/idbullshitpart3
Cleaning up ID Console code and other tweaks - The "I want to die" edition
2020-11-21 23:00:50 -07:00
Dahlular 6645e50dad Merge pull request #694 from ArchieBeepBoop/improvements
ATMOS Firelocks and more
2020-11-21 22:54:02 -07:00
Poss 27ec04f7a1 Update radio.dm 2020-11-21 22:16:32 -05:00
Poss c77574bf10 Update cigs_lighters.dm 2020-11-21 21:58:18 -05:00
Oposshim bb1694f301 Kinaris Corp 1.1.2
another long overdue haul of shit I forgot/was to busy to get the first patch around.
2020-11-21 12:05:56 -05:00
kevinz000 c7db7cb2be The ID Code Cleanup and Fixening (tm) 2020-11-20 20:55:27 -03:00
kevinz000 14b3fa22ce Merge pull request #9404 from Poojawa/qm-is-a-head
QM is a head of staff, Cargo ID Console added
2020-11-20 20:12:42 -03:00
Dahlular 7b1991a42a Merge pull request #689 from ArchieBeepBoop/darts
Tweaks smartdarts with a few quality of life functions, and add a few new things.
2020-11-19 23:23:17 -07:00
Dahlular 2e58f6ebb7 Merge pull request #687 from ArchieBeepBoop/mutation
Fixes mutations runtiming left and right / owner not being set in mutation
2020-11-19 23:22:12 -07:00
Dahlular 79d678fe19 Merge pull request #678 from ArchieBeepBoop/teleportfixes
[Testmerge] Mass fixing Teleporter issues + Implant Location Refactoring and Fixes
2020-11-19 23:18:37 -07:00
Ghom 7a8fcf77d4 ATMOS Firelocks and more 2020-11-19 11:04:04 -03:00
kevinz000 5eb8b535c3 Merge pull request #9505 from Thalpy/Smartdart-QoL
[READY] Tweaks smartdarts with a few quality of life functions, and add a few new things.
2020-11-17 00:31:16 -03:00
kevinz000 96a09b1793 Merge pull request #11578 from Ghommie/Ghommie-cit636
Fixing owner not being set in mutation/on_aquiring.
2020-11-15 19:19:44 -03:00
kevinz000 5f0ecb205b Merge pull request #9686 from Ghommie/Ghommie-cit304
Fixing storage implant transplant.
2020-11-12 04:00:11 -03:00
kevinz000 f85a275834 Merge pull request #9510 from Ghommie/Ghommie-cit240
Fixing tracking implant teleport issues.
2020-11-12 03:58:15 -03:00
kevinz000 4bd370532d Merge pull request #8401 from Ghommie/Ghommie-cit11
Refactoring Implants' loc n°3
2020-11-12 03:53:27 -03:00
Dip a76185269b Merge branch 'master' of https://github.com/ArchieBeepBoop/Hyper-Station-13 into syndicateleague2 2020-11-10 14:05:51 -03:00
Dahlular cbdce23df4 Merge pull request #652 from ArchieBeepBoop/virofixes
[TESTMERGE] The Viro Rework done right? Ports a load of viro, (sentient) disease, symptoms code updates from tg.
2020-11-10 01:54:24 -07:00
kevinz000 a663b96d2f Merge pull request #9263 from Trilbyspaceclone/batter_up
Adds a new traitor bundle - Syndicate Major League Player
2020-11-09 18:33:18 -03:00
QuoteFox 48cdd74808 Ridding crop sprite.
made a  ridding crop sprite. because it was using a chain before.
2020-11-09 15:27:51 +00:00
Dip 124a266e9a stack size 2020-11-05 23:57:54 -03:00
kevinz000 752a3d9bcc Merge pull request #9418 from Ghommie/Ghommie-cit216
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
2020-11-03 01:51:18 -03:00
Dip c4680a7c28 the sequel 2020-11-02 15:01:08 -03:00
Dip 8916a47eac let's fucking NOT 2020-11-02 06:26:01 -03:00
Ghom 28cdb9c5f1 Oh no. 2020-10-30 05:30:15 -03:00
Dip 9acf8ffd40 merge conflict drinks.dmi 2020-10-29 13:50:19 -03:00
kevinz000 82daa9b75e Merge pull request #9709 from Trilbyspaceclone/cargo_memes_3
Adds 8 more sci crates to cargo
2020-10-28 05:52:11 -03:00
kevinz000 45f7b020c4 Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
2020-10-28 05:48:57 -03:00
kevinz000 071f1cc6af Merge pull request #9198 from Trilbyspaceclone/A_Tailer's_art
Code stuffs + more framework for cargo rework cuz atomic prs are good
2020-10-28 04:52:13 -03:00
kevinz000 2c7c66fc89 Merge pull request #9589 from Ghommie/Ghommie-cit259
Porting GetComponent macros removal, and few other updates.
2020-10-27 14:42:55 -03:00
Dip 9b7eee0a89 merge conflict 2020-10-18 16:54:22 -03:00
Dahlular 7e05bf7e62 Merge pull request #591 from ArchieBeepBoop/durabelt2
Turns the Durathread Belt into a general belt for all main professions in terms of allowed items
2020-10-18 13:18:34 -06:00
Dip 6163b7c963 GRUG SMASH RUNTIME 2020-10-18 04:34:21 -03:00