Commit Graph
11113 Commits
Author SHA1 Message Date
TrilbyspacecloneandGitHub a7c8fb6470 corrects/adds a new dog fashion to telegram hat 2019-12-11 12:43:07 -05:00
LinandGitHub 9ec8458803 Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-12-10 23:52:31 +00:00
BlackMajorandGitHub 8817f04e19 Merge pull request #9747 from Ghommie/Ghommie-cit329
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
2019-12-10 11:18:55 +13:00
Putnam3145andGitHub ee65d93e5a Merge pull request #10086 from Ghommie/Ghommie-cit441
Fixes AI core display I may have broken with my coding extravaganza.
2019-12-09 13:41:25 -08:00
Putnam3145andGitHub 5522b3d11d Merge pull request #10037 from Ghommie/Ghommie-cit421
Doubles locomotion circuit ext cooldown. Nerfs gun & pneumatic cannons circuits with sanity checks.
2019-12-09 13:34:23 -08:00
Putnam3145andGitHub c54523e324 Merge pull request #9629 from Citadel-Station-13/kevinz000-patch-87
can we not tell all the nonantags that antagonist ooc is enabled please
2019-12-09 13:25:37 -08:00
Putnam3145andGitHub 975a40cadf Merge pull request #10094 from Trilbyspaceclone/patch-242
Fixes eletroplating of brozne/golden tool box
2019-12-09 13:23:13 -08:00
Putnam3145andGitHub 739f873ca6 Merge pull request #10132 from Trilbyspaceclone/patch-243
Makes meat hook fit in boh again
2019-12-09 13:08:12 -08:00
Putnam3145andGitHub beddaa1a99 Merge pull request #10053 from Ghommie/Ghommie-cit429
Fixes some means of eyes blindness not working, removes legacy code.
2019-12-09 12:40:37 -08:00
TrilbyspacecloneandGitHub 7c4fab127f Update necropolis_chests.dm 2019-12-09 15:37:22 -05:00
Putnam3145andGitHub 01bb9d79d9 Merge pull request #10114 from r4d6/n2o-pressure-tank
Add a N2O Pressure Tank
2019-12-09 12:33:03 -08:00
Artur 488c0f1833 Mindshield fix and thrall buff 2019-12-09 19:08:42 +02:00
kappa-samaandGitHub f790d675d9 flavor text 2019-12-09 09:06:11 -05:00
kevinz000andGitHub 20defaba8e Update conveyor2.dm 2019-12-08 21:46:53 -07:00
kappa-samaandGitHub e111429a30 the hippie thing 2019-12-08 23:37:33 -05:00
Ghommie 414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
Artur d184bdd77a Whoops 2019-12-08 22:22:30 +02:00
LinandGitHub ef01bbd222 Merge pull request #10075 from Ghommie/Ghommie-cit436
Demodularize defib disks and projectiles icons.
2019-12-08 20:15:01 +00:00
LinandGitHub 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
r4d6andGitHub 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
kappa-samaandGitHub cdda28f85c tabs 2019-12-08 03:54:55 -05:00
kappa-samaandGitHub 48be47d4d1 yes? 2019-12-08 03:54:29 -05:00
kappa-samaandGitHub 52a050e9ee maybe 2019-12-08 03:54:02 -05:00
kappa-samaandGitHub b015d2571a ==? 2019-12-08 03:51:36 -05:00
kappa-samaandGitHub 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
LinandGitHub 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
Thalpy f59bdbe14e Tweaks botany related ragent pHes so they're less likely to blow up. 2019-12-07 17:42:29 +00:00
Putnam3145andGitHub 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
UserothandGitHub 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
UserothandGitHub 28ddfd29b6 Merge branch 'master' into new-tg-plants 2019-12-07 14:25:38 +01:00
Ghommie d38475f06d i'm tired of this 2019-12-07 12:05:12 +01:00
TrilbyspacecloneandGitHub 156b7cabb1 Update recipes_misc.dm 2019-12-07 04:41:28 -05:00
kevinz000andGitHub 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
TrilbyspacecloneandGitHub 7ab66fd2e2 no wounder why I didnt push it, it never complied 2019-12-07 03:50:20 -05:00
TrilbyspacecloneandGitHub 6faad2e30b Update recipes_misc.dm 2019-12-07 03:46:25 -05:00
Useroth 5f56d40f58 Incorporated the bamboo grammar fixes. 2019-12-07 06:41:24 +01:00
Ghommie 7cc332960b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-12-07 05:30:07 +01:00
Ghommie 0a0094e80c Fixes stuff I broke with my coding extravaganza. 2019-12-07 05:11:29 +01:00
Ghommie 9152fe49e6 Typo. 2019-12-07 04:49:18 +01:00
Ghommie b9751006bb Fixes reviver implant having been a crapshot ever since soft-crit was introduced years ago. 2019-12-07 04:46:54 +01:00
nik707andGitHub e4a41c6169 Merge pull request #9932 from Putnam3145/fix-genital-contam
Make organs no longer radiaoctively contaminable.
2019-12-06 20:37:53 -06:00
Unknown 97e686cf23 Merge branch 'master' into xantholne-christmas01 2019-12-06 17:21:08 -07:00