Commit Graph

8564 Commits

Author SHA1 Message Date
Ghommie 8f410429de Ports "Renames SSsqueak to SSminor_mapping" 2019-07-13 07:08:03 +02: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
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
kevinz000 280aa9da08 Merge pull request #8860 from Trilbyspaceclone/Zelus_oil
Zelus oil - CWC gear
2019-07-12 07:41:28 -07: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
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
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
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 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
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
kevinz000 b5cb68fc68 Merge pull request #8844 from Ghommie/Ghommie-cit120
Fixes rocket launchers, buffing their accuracy etc.
2019-07-09 08:30:44 -07:00
Ghommie 490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
deathride58 e56fc559ed Merge pull request #8748 from Citadel-Station-13/kevinz000-patch-15
Raises corpse miasma generation by 5x. Lowers miasma disease chance per mole by 10x. Miasma now does absolutely nothing unless there's enough of it in the air to actually flow into scrubbers so there's no invisible pockets of disease stuck everywhere.
2019-07-08 18:15:20 -04:00
deathride58 9c0c4c8f59 Merge pull request #8683 from Citadel-Station-13/kevinz000-patch-3
Fixes end of round notify command, makes it so everyone can use it rather than just staff
2019-07-08 18:14:08 -04:00
deathride58 42cee552fe Merge pull request #8709 from Trilbyspaceclone/Fel_port_1
Ports "Fixes every issue in the slimes milestone. #44450"
2019-07-08 18:10:46 -04:00
deathride58 b8e34d1cab Merge pull request #8704 from Citadel-Station-13/kevinz000-patch-12
[s] RCD logging
2019-07-08 18:07:27 -04:00
deathride58 59577f8818 Merge pull request #8750 from Arturlang/Nanite_Brain_Damage_Fix
Fixes trauma healing nanites.
2019-07-08 18:07:04 -04:00
deathride58 947d33129c Merge pull request #8771 from Citadel-Station-13/kevinz000-patch-20
buffs wheelchair movespeeds/changes a floor in the equation to a round
2019-07-08 18:05:15 -04:00
deathride58 82d527b760 Merge pull request #8765 from Ghommie/Ghommie-cit91
Merging the end-of-shift and its shuttle autocall announcements into one.
2019-07-08 18:04:27 -04:00
deathride58 e391995b8e Merge pull request #8792 from Citadel-Station-13/kevinz000-patch-51
Buffs integrated circuitry advanced lights
2019-07-08 17:56:12 -04:00
deathride58 840cfb8ac0 Merge pull request #8818 from Citadel-Station-13/kevinz000-patch-53
fixes stimulum by changing one number
2019-07-08 17:54:56 -04:00
deathride58 58189d1528 Merge pull request #8820 from Ghommie/Ghommie-cit104
Ports "Add cancel button to assault pod destination selector"
2019-07-08 17:54:08 -04:00
deathride58 fca529cb07 Merge pull request #8823 from Ghommie/Ghommie-cit108
Ports "fixes spontaneous appendicitis picking incompatible biotypes"
2019-07-08 17:52:49 -04:00
deathride58 81bbab809e Merge pull request #8821 from Ghommie/Ghommie-cit105
Ports "Updates corgi & parrot inventory panels to the same formatting as other mobs"
2019-07-08 17:51:32 -04:00
deathride58 3be59ba804 Merge pull request #8828 from Ghommie/Ghommie-cit113
Ports "Makes ventcrawl much easier on the client"
2019-07-08 17:49:01 -04:00
deathride58 ee6004e781 Merge pull request #8835 from Linzolle/berethair
normalises hop and cap's berets to not hide hair
2019-07-08 17:43:34 -04:00
deathride58 8f77e9cbe5 Merge pull request #8839 from Ghommie/Ghommie-cit118
Fixes lobby ghost roles, for real.
2019-07-08 17:32:53 -04:00
deathride58 11a48880e1 Merge pull request #8834 from Ghommie/Ghommie-cit117
Fixes up space ninja's energy net.
2019-07-08 17:31:04 -04:00
Ghommie 1c6156dd0e Fixes rocket launchers, buffing their accuracy etc. 2019-07-08 06:56:20 +02:00
Cyprian b8d9139bb2 SHOEEEEEEEESgit statusgit status 2019-07-08 01:58:02 +02:00
UristMcAstronaut 38b3ace14b Update pai_shell.dm 2019-07-07 21:09:03 +00:00
Ghommie 49c8a08c15 Removes the ? that suppressed runtimes. 2019-07-07 20:39:40 +02:00
Ghommie ef745a850d Fixing lobby ghost roles for real. 2019-07-07 20:38:08 +02:00
kevinz000 1b4df74efb Merge pull request #8802 from Ghommie/Ghommie-cit101
Ports in RPGs for nuke ops, failsafe uplink codes, some carp plushie exploit fix etc.
2019-07-07 02:39:07 -07:00
kevinz000 6e5ec4594c Merge pull request #8800 from Sishen1542/freeza
Adds click interactions  to atmos heater/freezer
2019-07-07 02:35:12 -07:00
kevinz000 e227d5575c Merge pull request #8825 from Ghommie/Ghommie-cit110
Ports "Fixes default supplypods exploding their contents" & co.
2019-07-07 02:34:47 -07:00
kevinz000 91f114f717 Merge pull request #8832 from Ghommie/Ghommie-cit116
Fixes new player runtime that makes people unable to join rounds.
2019-07-07 02:33:32 -07:00
kevinz000 9d13576cc9 Merge pull request #8826 from Ghommie/Ghommie-cit111
Ports "Adds safer helper for alt-click turf listing"
2019-07-07 02:32:56 -07:00