Commit Graph

3422 Commits

Author SHA1 Message Date
kevinz000 9bd4719c0a wrong type 2020-02-27 20:09:29 -07:00
kevinz000 045d5b2dbf fixes 2020-02-27 20:06:52 -07:00
kevinz000 f4e49f339b k 2020-02-27 18:29:27 -07:00
kevinz000 1711fcaa06 k 2020-02-26 15:56:01 -07:00
kevinz000 25a2b34c38 some fixes 2020-02-26 05:59:53 -07:00
kevinz000 872872d9f9 move stuff 2020-02-26 05:38:34 -07:00
kevinz000 76c1d5ddb9 k 2020-02-25 15:40:00 -07:00
kevinz000 5a320c7933 fugg u 2020-02-25 14:37:40 -07:00
kevinz000 bfb8139225 DefaultCombatknockdown 2020-02-25 03:18:37 -07:00
kevinz000 8b06f6d4e9 message fix 2020-02-25 03:08:34 -07:00
kevinz000 2eae147e93 ok 2020-02-24 16:51:35 -07:00
kevinz000 424eb48d9e fixes 2020-02-24 01:59:45 -07:00
kevinz000 f6542b381c Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 23:29:25 -07:00
kevinz000 b8d60a33bd partial fix 2020-02-21 23:29:13 -07:00
kevinz000 f2a17b8b35 Update robot_mobility.dm 2020-02-21 18:17:07 -07:00
Ghommie 8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
kevinz000 a784a74ccb Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 13:35:26 -07:00
Ghom e92183e968 Merge pull request #10541 from Detective-Google/the-p-o-o-l
adds the POOL to box station
2020-02-21 02:43:04 +01:00
Ghom 4649183a47 Merge pull request #11154 from Kraseo/fuck-nightmares
Fixes nightmares deleting guns with flashlights
2020-02-20 20:52:29 +01:00
Ghom 7763475b83 Merge pull request #10572 from Tupinambis/SiliconDefault
Removes harm prevention clause indicators from relevant sources.
2020-02-20 15:33:27 +01:00
kevinz000 ca777c6c8b Merge pull request #11153 from Ghommie/Ghommie-cit587
Fixing addiction moodlets not going away and secret sauce recipe paper.
2020-02-20 06:17:33 -07:00
Ghom d680ab9fd5 Merge pull request #11025 from Arturlang/TGUI_Next_Nanites
Ports TGUI Next and a lot of misc updates for nanites.
2020-02-20 11:27:48 +01:00
Ghom 32c001f264 Merge pull request #11140 from Citadel-Station-13/kevinz000-patch-15
buffs pai radio short 5 -> 3 minutes
2020-02-20 11:26:17 +01:00
Ghom 7d8ae07fa0 Merge pull request #11139 from Citadel-Station-13/kevinz000-patch-12
projectiles now pierce through pAIs no matter what
2020-02-20 11:09:03 +01:00
Ghom c1f8deb4a5 Merge pull request #11141 from Citadel-Station-13/kevinz000-patch-17
removes pai fulltile opacity
2020-02-20 11:08:27 +01:00
kevinz000 c7273c03be Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-19 19:12:27 -07:00
kevinz000 9589c3116b Merge pull request #11115 from Ghommie/Ghommie-cit583
Something more about runtime errors.
2020-02-19 19:03:01 -07:00
kevinz000 b983aa75ea Merge pull request #11145 from Ghommie/Ghommie-cit586
Something about pAIs and silicon access priviledges.
2020-02-19 18:59:10 -07:00
Kraseo cd56e29a98 drink my ass kevinz 2020-02-20 00:18:43 +01:00
Arturlang 796f51b557 Merge branch 'master' into TGUI_Next_Nanites 2020-02-20 00:52:55 +02:00
Kraseo f532c1a444 i spent 2 hours figuring out how to fix this 2020-02-19 18:40:30 +01:00
kevinz000 34fbcd1dc0 fixes 2020-02-19 07:49:05 -07:00
kevinz000 4a537d770d let's make this work 2020-02-19 07:20:16 -07:00
Ghommie 057b6f591c HEEY 2020-02-19 14:23:12 +01:00
Ghommie 37ba75ec12 Fixing addiction moodlets not going away and secret sauce recipe paper. 2020-02-19 14:07:11 +01:00
kevinz000 950082f537 k 2020-02-18 20:49:42 -07:00
kevinz000 0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
Ghom 08c86ec1ea Merge pull request #11091 from BlueWildrose/master
Podpeople species tail wag fix; also lifebringer name fix
2020-02-18 17:11:50 +01:00
Ghommie 698f0b8177 Something about pAIs and silicon access priviledges. 2020-02-18 16:20:44 +01:00
kevinz000 d04126226b Merge pull request #11082 from Hatterhat/preservahyde
preservahyde, alt title "what if i didnt die from having shit rng and a single epipen"
2020-02-18 02:21:37 -07:00
kevinz000 918618831c Merge pull request #11109 from Citadel-Station-13/Ghommie-patch-3
Something about gibs and mob biotypes.
2020-02-18 02:17:32 -07:00
kevinz000 d6fe0df7ac Update pai.dm 2020-02-18 02:10:03 -07:00
kevinz000 9264163d93 Update pai.dm 2020-02-18 01:47:20 -07:00
kevinz000 6a97006b12 Update pai_defense.dm 2020-02-18 01:41:28 -07:00
BlueWildrose 78fcd706b3 Requested changes, podpeople.dm 2020-02-17 19:41:30 -07:00
Lin a37e1ab129 Merge pull request #11093 from Ghommie/Ghommie-cit580
Something about blood and species handle_chemicals()
2020-02-16 12:36:41 -06:00
Ghommie 23ae9996d2 Something more about runtime errors. 2020-02-16 15:24:15 +01:00
kevinz000 379c914099 Merge pull request #10704 from Ghommie/Ghommie-cit529
More Runtimenator fixes.
2020-02-16 05:10:19 -07:00
Trilbyspaceclone a8d45f8361 Update crab.dm (#11105) 2020-02-16 07:39:56 +01:00
Ghom abf7d2423a Update death.dm 2020-02-16 07:17:53 +01:00