Commit Graph

19834 Commits

Author SHA1 Message Date
Lin ef01bbd222 Merge pull request #10075 from Ghommie/Ghommie-cit436
Demodularize defib disks and projectiles icons.
2019-12-08 20:15:01 +00:00
Lin 9c7ac9a469 Merge pull request #10071 from Ghommie/Ghommie-cit434
Fixes bubblegum's death not unlocking the arena shuttle buyment since the medals subsystem is not hub enabled
2019-12-08 20:01:50 +00:00
Artur 9773b530f8 More fixes. Urgh 2019-12-08 21:47:25 +02:00
Useroth 1d0438800e Touched up a copy-paste leftover. 2019-12-08 17:04:11 +01:00
Useroth ea4f57beb6 Spaghettid my way around the errors. 2019-12-08 16:47:21 +01:00
kevinz000 83ab577a6a Update launchpad_control.dm 2019-12-08 07:30:05 -07:00
r4d6 2eca1657ab Add a N2O Pressure Tank 2019-12-08 08:54:50 -05:00
Useroth 5e836c51e4 Forgot to track the new files 2019-12-08 14:05:05 +01:00
Useroth a37f2de71d First step of porting lavaland tumors. Looks like Cita is much behind tg regarding simplemobs. 2019-12-08 14:00:08 +01:00
Ghommie a9335aa946 Fixes a long lasting runtime with filter data sorting. 2019-12-08 13:21:29 +01:00
kappa-sama cdda28f85c tabs 2019-12-08 03:54:55 -05:00
kappa-sama 48be47d4d1 yes? 2019-12-08 03:54:29 -05:00
kappa-sama 52a050e9ee maybe 2019-12-08 03:54:02 -05:00
kappa-sama b015d2571a ==? 2019-12-08 03:51:36 -05:00
kappa-sama 10c844e70d does this even work 2019-12-08 03:36:09 -05:00
Hatterhat 379a01c3fe packin some more doo dee doo 2019-12-08 01:42:56 -06:00
Hatterhat 6ff7083bfb the one where i buff a 4 tc item, give trilby a (You), and squash my commits 2019-12-08 01:29:08 -06:00
DeltaFire c0433ec944 I scream
why can't I read
2019-12-08 04:25:37 +01:00
DeltaFire 59e97989c0 I scream
Hnnnnngh
2019-12-08 04:20:04 +01:00
DeltaFire 88acc15fe5 scream if you want, it won't help you.
Removes oxydamage from the "did you take damage" calculation for stuntime reduction
2019-12-08 03:46:55 +01:00
Lin a91139c470 Merge pull request #10068 from Ghommie/Ghommie-cit433
Ports "Makes the windup toolbox more similar to His Grace".
2019-12-07 21:52:10 +00:00
Lin 24e4673c2b Merge pull request #10057 from Ghommie/Ghommie-cit431
fixes on_mob eyes overlays not updating properly in certain cases.
2019-12-07 21:49:18 +00:00
TrilbySpaceClone 67d3d19cb9 correctiosn
and movement
2019-12-07 13:43:34 -05:00
TrilbySpaceClone e5c8f7bf06 Merge branch 'master' into glassware 2019-12-07 12:50:32 -05:00
Thalpy f59bdbe14e Tweaks botany related ragent pHes so they're less likely to blow up. 2019-12-07 17:42:29 +00:00
Thalpy 60c555c7e1 Merge branch 'master' into Superbases-goodbye 2019-12-07 17:37:05 +00:00
Putnam3145 cece6dd43d Merge pull request #10098 from Ghommie/Ghommie-cit445
Fixes a lil issue with ice cream cones.
2019-12-07 08:48:21 -08:00
Useroth c35acf00fe Empty commit to make travis recompile. 2019-12-07 15:18:37 +01:00
Artur 4711eb0987 Merge remote-tracking branch 'upstream/master' into Bloodsuckers 2019-12-07 15:53:11 +02:00
Useroth 28ddfd29b6 Merge branch 'master' into new-tg-plants 2019-12-07 14:25:38 +01:00
Ghommie 95cc84e69e Fixes a few holo barriers' transparency. 2019-12-07 12:13:33 +01:00
Ghommie d38475f06d i'm tired of this 2019-12-07 12:05:12 +01:00
Trilbyspaceclone bffe3b6da0 should be the last fix! 2019-12-07 05:21:48 -05:00
Trilbyspaceclone 0c82357159 Update condiment.dm 2019-12-07 05:18:14 -05:00
Trilbyspaceclone f4aca7cf85 Update meat.dm 2019-12-07 05:17:39 -05:00
kevinz000 2e0b019bd7 Update utility.dm 2019-12-07 03:11:54 -07:00
Trilbyspaceclone c27e507bca Update food_reagents.dm 2019-12-07 05:01:12 -05:00
Ghommie f83d1c4763 Made kevlar and armor padding accessories inconspicious and examine-proof. 2019-12-07 10:53:10 +01:00
Trilbyspaceclone 89b9df23bc le sigh 2019-12-07 04:43:58 -05:00
Trilbyspaceclone 46ad42708c massive TG sigh 2019-12-07 04:42:48 -05:00
Trilbyspaceclone 156b7cabb1 Update recipes_misc.dm 2019-12-07 04:41:28 -05:00
TrilbySpaceClone c9ee29ad02 hmm 2019-12-07 04:33:42 -05:00
Ghommie 19b9cbbb69 F 2019-12-07 09:58:37 +01:00
kevinz000 c706720dd1 Merge pull request #9912 from Owai-Seek/cargocleanupv2boogaloo
Added 15+ new crates, fixed issues raised in #9901
2019-12-07 01:52:35 -07:00
Trilbyspaceclone 7ab66fd2e2 no wounder why I didnt push it, it never complied 2019-12-07 03:50:20 -05:00
Trilbyspaceclone 6faad2e30b Update recipes_misc.dm 2019-12-07 03:46:25 -05:00
Ghommie a82e0b9ee5 Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks. 2019-12-07 09:45:38 +01:00
TrilbySpaceClone 025a7cd79a more ports
https://github.com/tgstation/tgstation/pull/46924
https://github.com/tgstation/tgstation/pull/48050
2019-12-07 03:04:02 -05:00
Ghommie bb83d69aa0 Deepfries the trekkie security alert sounds to be three times more annoying, as well as replace the delta alert with the THX Deep Note... actually not. 2019-12-07 08:06:30 +01:00
TrilbySpaceClone c4450579ac Why does breakfast have a timer?
https://github.com/tgstation/tgstation/pull/44419
https://github.com/tgstation/tgstation/pull/46220
https://github.com/tgstation/tgstation/pull/44914
https://github.com/tgstation/tgstation/pull/46933
https://github.com/tgstation/tgstation/pull/48153
https://github.com/tgstation/tgstation/pull/46898
2019-12-07 01:53:55 -05:00