Commit Graph

30497 Commits

Author SHA1 Message Date
keronshb
3b9f9d7a16 Requested changes
Requested changes
2020-02-15 18:15:41 -05:00
Trilbyspaceclone
470e786765 Update expressconsole.dm 2020-02-15 15:59:09 -05:00
Hatterhat
0f5ea361e7 bada bing bada boom 2020-02-15 14:07:35 -06:00
Hatterhat
c9af8dc713 perhaps 2020-02-15 14:05:27 -06:00
kevinz000
36cebc733c Merge pull request #11039 from Ghommie/Ghommie-cit572
Something about a couple runtimes.
2020-02-15 12:19:50 -07:00
kevinz000
7ee04aa608 Merge pull request #10998 from Ghommie/Ghommie-cit569
Something about the in operator and spaceDMM version update.
2020-02-15 12:17:37 -07:00
Persi
0c9244f669 Clarifies comments and locks defusal kits behind an emag 2020-02-15 14:17:22 -05:00
kevinz000
ee9b38017e Merge pull request #10995 from Ghommie/Ghommie-cit568
Something about cryopods.
2020-02-15 12:17:02 -07:00
kevinz000
b46dd3246d Merge pull request #10968 from Citadel-Station-13/Ghommie-patch-4
/datum/element/cleaning cleans your face!
2020-02-15 12:16:39 -07:00
CitadelStationBot
7a0f779a61 Automatic changelog generation for PR #10947 [ci skip] 2020-02-15 13:16:26 -06:00
kevinz000
f79148d549 Merge pull request #10947 from Ghommie/Ghommie-cit563
Holopad static fix and a few other mistakes.
2020-02-15 12:16:23 -07:00
CitadelStationBot
c7176b522f Automatic changelog generation for PR #10940 [ci skip] 2020-02-15 13:15:52 -06:00
kevinz000
b9e8be5784 Merge pull request #10940 from Ghommie/Ghommie-cit560
First tweak to cargo reagents selling.
2020-02-15 12:15:50 -07:00
CitadelStationBot
274fac7576 Automatic changelog generation for PR #10923 [ci skip] 2020-02-15 13:15:33 -06:00
kevinz000
56545d742d Merge pull request #10923 from Citadel-Station-13/Ghommie-patch-7
Nerfing cargo passive points generation
2020-02-15 12:15:31 -07:00
kevinz000
fc5eeeac00 Update gun.dm 2020-02-15 12:14:51 -07:00
kevinz000
eb33901046 Merge pull request #11002 from BlackMajor/walkerbois
Makes the Ash Walker camp a static spawn in lavaland.
2020-02-15 11:47:58 -07:00
kevinz000
957c6168b6 Merge pull request #11006 from Ghommie/Ghommie-cit570
Something about a couple stack trace issues.
2020-02-15 11:47:30 -07:00
CitadelStationBot
b057a36fb7 Automatic changelog generation for PR #11071 [ci skip] 2020-02-15 12:46:59 -06:00
kevinz000
e250fb0a57 Merge pull request #11071 from Citadel-Station-13/Ghommie-patch-1
Something about disposal bins and trash bags.
2020-02-15 11:46:56 -07:00
kevinz000
b705e2fe37 Merge pull request #11069 from Ghommie/Ghommie-cit575
Fixing some privates overlays
2020-02-15 11:46:18 -07:00
CitadelStationBot
638daad243 Automatic changelog generation for PR #11072 [ci skip] 2020-02-15 12:46:03 -06:00
kevinz000
6e2e7e29d1 Merge pull request #11072 from Ghommie/Ghommie-cit576
Doubled halved flavor text max length and removed crappy code.
2020-02-15 11:46:00 -07:00
CitadelStationBot
69a0fa6ca7 Automatic changelog generation for PR #11073 [ci skip] 2020-02-15 12:45:53 -06:00
kevinz000
29c422a2e6 Merge pull request #11073 from Ghommie/Ghommie-cit577
Reduced tongue organ damage and tasting pH message spam.
2020-02-15 11:45:50 -07:00
CitadelStationBot
24bb8b330f Automatic changelog generation for PR #11075 [ci skip] 2020-02-15 12:45:41 -06:00
kevinz000
d2398f4584 Merge pull request #11075 from Citadel-Station-13/Ghommie-patch-2
Porting agent card updates and registered name fix.
2020-02-15 11:45:39 -07:00
kevinz000
24b977f655 Merge branch 'master' into stuff 2020-02-15 11:45:25 -07:00
CitadelStationBot
8162aad3e6 Automatic changelog generation for PR #11047 [ci skip] 2020-02-15 12:44:54 -06:00
kevinz000
fa015c93bf Merge pull request #11047 from Trilbyspaceclone/patch-282
Buffs oats and makes meatwheat have rarity
2020-02-15 11:44:52 -07:00
CitadelStationBot
852dc40d3c Automatic changelog generation for PR #11040 [ci skip] 2020-02-15 12:44:27 -06:00
kevinz000
76b5dec4bb Merge pull request #11040 from Ghommie/Ghommie-cit573
Further mob holder fixes.
2020-02-15 11:44:25 -07:00
CitadelStationBot
a33669aacd Automatic changelog generation for PR #11094 [ci skip] 2020-02-15 12:12:22 -06:00
Trilbyspaceclone
661e01ca0c Update miscellaneous.dm (#11094) 2020-02-15 19:12:19 +01:00
Ghommie
72efdec3fb Porting pair pinpointers and fixing an edge case runtime. 2020-02-15 19:12:07 +01:00
Microvolnovka19
3f9965a781 Some sprite fixes (#11089)
* Delete penis_onmob.dmi

* Some sprite fixes

* Delete penis_onmob.dmi

* This should be ok

* Delete penis_onmob.dmi

* This should be ok?

* Delete penis_onmob.dmi

* This totally should be ok
2020-02-15 11:30:00 +01:00
CitadelStationBot
95398af552 Automatic changelog generation for PR #11048 [ci skip] 2020-02-15 02:05:47 -06:00
Ghom
8e3673480f Merge pull request #11048 from Trilbyspaceclone/patch-283
Blood Drunk Miner now uses a PKA
2020-02-15 09:05:45 +01:00
CitadelStationBot
b5015f696f Automatic changelog generation for PR #11086 [ci skip] 2020-02-15 02:04:56 -06:00
Ghom
06d38eb3dc Merge pull request #11086 from YakumoChen/the-ring-2
Ring Improvements
2020-02-15 09:04:54 +01:00
Ghom
ad639d5f2f Merge pull request #11084 from Citadel-Station-13/kevinz000-patch-7
!tgs valentine
2020-02-15 09:04:29 +01:00
Ghom
acdc3cd2be Merge pull request #11095 from Citadel-Station-13/kevinz000-patch-4
Fixes exosuit fabricators
2020-02-15 09:00:21 +01:00
kevinz000
f6cf5adb4c Update mech_fabricator.dm 2020-02-14 15:33:47 -07:00
kevinz000
d97b1d4e80 Update mech_fabricator.dm 2020-02-14 15:30:06 -07:00
Hatterhat
5a9208bc42 shit whoops 2020-02-14 16:29:17 -06:00
Hatterhat
3b873d4000 thanks ghommie 2020-02-14 16:28:39 -06:00
kevinz000
f36b89a6e3 Update misc.dm 2020-02-14 11:53:50 -07:00
CitadelStationBot
d3926d73ac Automatic changelog generation for PR #10792 [ci skip] 2020-02-14 12:44:18 -06:00
kevinz000
245e3e0dfb Merge pull request #10792 from Ghommie/Ghommie-cit539
topic_input removal and odysseus syringe gun fix.
2020-02-14 11:44:15 -07:00
Ghom
0a1c3bd084 Merge branch 'master' into Ghommie-cit539 2020-02-14 19:42:36 +01:00