shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,913 Commits 5 Branches 0 Tags
92fadcf23046c39503a9cd034e1a564d6e10c59e
Commit Graph

13685 Commits

Author SHA1 Message Date
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
kevinz000
564904adf0 Merge pull request #8761 from Trilbyspaceclone/patch-187 
[Ready] Tweaks shields
 2019-07-10 22:02:19 -07:00
Trilbyspaceclone
48e15307c5 Update other_reagents.dm 2019-07-10 19:14:57 -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
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
deathride58
33ed7cf72c Merge pull request #8822 from Ghommie/Ghommie-cit107 
[s] ports "Fixes infinite brass generation exploit"
 2019-07-08 17:43:59 -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
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
d61732472c Merge pull request #8831 from Ghommie/Ghommie-cit115 
Holographic PDA Quickfix!
 2019-07-07 11:08:15 -07: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
kevinz000
6944725cfb Merge pull request #8824 from Ghommie/Ghommie-cit109 
Ports "Fixes damp rag not smothering people"
 2019-07-07 02:31:26 -07:00
kevinz000
fd592e5815 Merge pull request #8827 from Ghommie/Ghommie-cit112 
Ports "Makes looping sounds use client time"
 2019-07-07 02:31:10 -07:00
kevinz000
d0a74ef331 Revert "Adds a can_inject check to IV Drips" 2019-07-07 02:29:49 -07:00
Linzolle
1731d4a266 normalises hop and cap's berets to not hide hair 2019-07-07 01:44:58 -05:00
Ghommie
3404131f3a don't init yet. 2019-07-07 05:19:13 +02:00
Ghommie
696dd2839b clunky. 2019-07-07 05:13:14 +02:00
Ghommie
b2192f0530 Fixes up space ninja's energy net. 2019-07-07 05:06:03 +02:00
Ghommie
fe2abc990b Fixes new player runtime that makes people unable to join rounds. 2019-07-06 04:51:56 +02:00
Ghommie
00879a6e28 Holographic PDA Quickfix! 2019-07-06 03:46:01 +02:00
kevinz000
748550895d Merge pull request #8632 from Arturlang/Traitor_Codeword_Highlight 
Ports traitor codeword highlighting
 2019-07-05 06:57:49 -07:00
kevinz000
77743c9a0f Merge pull request #8794 from Ghommie/Ghommie-cit100 
Fixes the uplink category indexing.
 2019-07-05 06:56:22 -07:00
kevinz000
231e0170a9 Merge pull request #8663 from Ghommie/Ghommie-cit58 
Peanuts, peanut butter, and PB&J sandwiches.
 2019-07-05 06:55:49 -07:00
kevinz000
7544748570 Merge pull request #8790 from deathride58/pryablesleepers 
Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers via crowbar
 2019-07-05 06:55:18 -07:00