Commit Graph

21972 Commits

Author SHA1 Message Date
Trilbyspaceclone ea77d524e6 guess ill fuck up 2019-07-12 21:48:03 -04:00
TrilbySpaceClone f68501b101 rng 2019-07-12 21:24:44 -04:00
TrilbySpaceClone b2345b19ce critcal 2019-07-12 21:21:52 -04:00
CitadelStationBot 194e420a1c Automatic changelog generation for PR #8734 [ci skip] 2019-07-12 09:43:14 -05:00
kevinz000 c012418cf7 Merge pull request #8734 from Ghommie/Ghommie-cit84
Sort of porting "Changes the type pathing of some "random" items"
2019-07-12 07:43:12 -07:00
CitadelStationBot a863941fa1 Automatic changelog generation for PR #8812 [ci skip] 2019-07-12 09:42:14 -05:00
kevinz000 13b1e5d409 Merge pull request #8812 from Sishen1542/surgery-hugboxing
Using the wrong tool during surgery won't hit the patient with it. Also stops medical borgs from attacking with surgical tools outside of harm intent.
2019-07-12 07:42:11 -07:00
CitadelStationBot 8dc09d5279 Automatic changelog generation for PR #8860 [ci skip] 2019-07-12 09:41:30 -05:00
kevinz000 280aa9da08 Merge pull request #8860 from Trilbyspaceclone/Zelus_oil
Zelus oil - CWC gear
2019-07-12 07:41:28 -07:00
CitadelStationBot 15c42c1928 Automatic changelog generation for PR #8870 [ci skip] 2019-07-12 09:40:21 -05:00
kevinz000 f2e67f2b9a Merge pull request #8870 from Ghommie/Ghommie-cit130
toning down many species' standard female chest.
2019-07-12 07:40:19 -07:00
CitadelStationBot 9c07979b34 Automatic changelog generation for PR #8842 [ci skip] 2019-07-12 09:36:50 -05:00
kevinz000 53642c5104 Merge pull request #8842 from UristMcAstronaut/master
allows pais to activate holoform while in a pai connector
2019-07-12 07:36:48 -07:00
CitadelStationBot febde0833f Automatic changelog generation for PR #8847 [ci skip] 2019-07-12 09:36:31 -05:00
kevinz000 57891813db Merge pull request #8847 from Ghommie/Ghommie-cit123
Porting in two bar signs.
2019-07-12 07:36:29 -07:00
CitadelStationBot 0f839a6692 Automatic changelog generation for PR #8854 [ci skip] 2019-07-12 09:36:03 -05:00
kevinz000 650842b384 Merge pull request #8854 from Ghommie/Ghommie-cit126
Stamina damage melee weaponry fixes.
2019-07-12 07:36:01 -07:00
CitadelStationBot 557f7b6ea3 Automatic changelog generation for PR #8846 [ci skip] 2019-07-12 09:35:27 -05:00
kevinz000 e5d445c4d3 Merge pull request #8846 from Ghommie/Ghommie-cit122
Rubber toolboxes.
2019-07-12 07:35:25 -07:00
CitadelStationBot 032ac19373 Automatic changelog generation for PR #8872 [ci skip] 2019-07-12 09:35:06 -05:00
kevinz000 e26277b67c Merge pull request #8872 from deathride58/lightermops
Janitors are no longer diabetic - nerfs mop stamina usage to be in-line with how much effort mopping takes IRL
2019-07-12 07:35:04 -07:00
CitadelStationBot 6caacbe962 Automatic changelog generation for PR #8853 [ci skip] 2019-07-12 09:34:21 -05:00
kevinz000 1eaddd3ebf Merge pull request #8853 from Ghommie/Ghommie-cit125
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
2019-07-12 07:34:19 -07:00
CitadelStationBot 410db33193 Automatic changelog generation for PR #8843 [ci skip] 2019-07-12 09:33:38 -05:00
kevinz000 aeb2216551 Merge pull request #8843 from Coolgat3/tacticoolness
Makes combat boots look T A C T I C O O L
2019-07-12 07:33:36 -07:00
CitadelStationBot daf2f85827 Automatic changelog generation for PR #8852 [ci skip] 2019-07-12 09:32:31 -05:00
kevinz000 bb568d633b Merge pull request #8852 from Tupinambis/CursedPlush
Removes a plush representing the character of an underage player.
2019-07-12 07:32:29 -07:00
Tupinambis cc901128c4 Oops I broke descriptions and sounds. Let me fix that. 2019-07-11 18:03:32 -05:00
deathride58 8d4c3b8ce9 Janitors are no longer diabetic - nerfs mop stamina usage to be more in-line with how much effort mopping takes IRL 2019-07-11 18:37:59 -04:00
kevinz000 c76f6b8a54 Merge pull request #8862 from BlackMajor/Burgit-Branch-2
Admin cream pie smite no longer makes its victims fat
2019-07-11 04:57:50 -07:00
Ghommie b59c2837f6 "that's a penis" 2019-07-11 12:04:50 +02:00
Ghommie 517cfe227f toning down many species' standard female chest. 2019-07-11 11:43:13 +02:00
Ghommie 92fadcf230 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit84 2019-07-11 09:07:11 +02:00
Trilbyspaceclone 27a8876e99 I dont care anymore, It works in testing to function fine
I dont see a problem is this, kinda would like citation on were Clockies will get added in the last else claim.
2019-07-11 01:15:39 -04:00
CitadelStationBot d24b02f414 Automatic changelog generation for PR #8761 [ci skip] 2019-07-11 00:02:21 -05:00
kevinz000 564904adf0 Merge pull request #8761 from Trilbyspaceclone/patch-187
[Ready] Tweaks shields
2019-07-10 22:02:19 -07:00
CitadelStationBot 55afc07a40 Automatic changelog generation for PR #8858 [ci skip] 2019-07-10 23:58:46 -05:00
kevinz000 739ea950d1 Merge pull request #8858 from Trilbyspaceclone/patch-191
Makes unholy water not do toxin damage to fellow slime cultys
2019-07-10 21:58:44 -07:00
Trilbyspaceclone 146276014c Update other_reagents.dm 2019-07-10 20:42:12 -04:00
Trilbyspaceclone 48e15307c5 Update other_reagents.dm 2019-07-10 19:14:57 -04:00
Trilbyspaceclone ac9c672fa8 I guess this is better 2019-07-10 18:56:32 -04:00
Trilbyspaceclone ed89ac874b this was fine 2019-07-10 18:44:14 -04:00
Trilbyspaceclone baf4529e52 Update other_reagents.dm 2019-07-10 18:32:10 -04:00
Trilbyspaceclone d53d11de6b Apply suggestions from code review
Grammer and such

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-07-10 18:21:03 -04:00
BlackMajor 2717590e9f No more fat smites 2019-07-10 21:01:41 +12:00
Trilbyspaceclone c9e13f8d62 better wording* 2019-07-10 02:43:18 -04:00
TrilbySpaceClone 54c28b19af Zelus indeed 2019-07-10 02:29:42 -04:00
Trilbyspaceclone e1ed96f419 Update other_reagents.dm 2019-07-09 23:08:11 -04:00
Trilbyspaceclone b03c197d0e forgot the var 2019-07-09 22:58:13 -04:00
Trilbyspaceclone 6240222ed7 Update other_reagents.dm 2019-07-09 21:58:22 -04:00