Commit Graph

14051 Commits

Author SHA1 Message Date
Ghommie bef0027287 In a haste, we forget thousand things. 2019-07-11 08:50:47 +02:00
Ghommie 26ab7cc522 Ports "Show codewords on round end screen" 2019-07-11 08:40:11 +02:00
Ghommie 081c07098f randomizing colors. 2019-07-11 08:08:07 +02:00
Ghommie 143410c176 Blame Poojawa for the issue. 2019-07-11 07:39:29 +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
kevinz000 564904adf0 Merge pull request #8761 from Trilbyspaceclone/patch-187
[Ready] Tweaks shields
2019-07-10 22:02:19 -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
Fermi 8f555b0fdd Reworked Astral, doubled lung damage, fixed lung damage oopsie. 2019-07-10 21:35:47 +01: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
Fermi aece9b31ed Mistakessss! 2019-07-09 23:28:12 +01:00
Fermi ce390fb595 Tweaks to MK 2019-07-09 23:27:37 +01:00
Ghommie ba7c24a0ec Refactoring underwear to allow custom color preferences. 2019-07-09 23:25:54 +02:00
Fermi c12c5be2b6 Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 2019-07-09 20:36:19 +01:00
Fermi 3a2192ec2e Hotfix for captain. 2019-07-09 20:36:16 +01: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 9cf2dea999 Grille spam. 2019-07-09 08:35:32 +02:00
Ghommie 3546ed9799 Stamina damtype weaponry fixes. 2019-07-09 08:33:43 +02: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
Tupinambis 8c0c80fc39 Removes references to the character of another underage player. 2019-07-09 00:02:16 -05:00
Thalpy c418312cc6 Merge branch 'master' into master 2019-07-09 05:33:09 +01:00
Tupinambis 0057ac7c5c Removed a plush representing the character of a player that was banned for being underaged. 2019-07-08 22:23:16 -05:00
Ghommie 5b97a7533d it only affects maploaded items anyway. 2019-07-09 04:34:13 +02:00
Fermi 1b3de620f9 BM requests. 2019-07-09 02:44:17 +01:00
Trilbyspaceclone 22cb46cb22 Update shields.dm 2019-07-08 20:30:46 -04: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 b8229b365c Merge pull request #8655 from Citadel-Station-13/kevinz000-patch-2
Fixes RLD icon
2019-07-08 18:12:02 -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 d218739bf8 Merge pull request #8740 from Ghommie/Ghommie-cit87
ports "More variety for dorms bedsheets" + 3 new bed sheets.
2019-07-08 18:06:11 -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 e19c622b08 Merge pull request #8837 from Citadel-Station-13/revert-8244-iv-dripper-punctures
Revert "Adds a can_inject check to IV Drips"
2019-07-08 17:57:30 -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