Commit Graph

8775 Commits

Author SHA1 Message Date
Fermi
110f0cbb83 Fixes and making a message clearer so people don't think it's admins. 2019-07-13 19:17:19 +01:00
Fermi
8f555b0fdd Reworked Astral, doubled lung damage, fixed lung damage oopsie. 2019-07-10 21:35:47 +01:00
Fermi
ce390fb595 Tweaks to MK 2019-07-09 23:27:37 +01: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
Thalpy
c418312cc6 Merge branch 'master' into master 2019-07-09 05:33:09 +01:00
Fermi
1b3de620f9 BM requests. 2019-07-09 02:44:17 +01: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
Fermi
d870604322 Missed one 2019-07-08 19:59:51 +01:00
Fermi
c3ac34158a Fixed shock command. 2019-07-08 19:51:10 +01: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
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
Linzolle
1731d4a266 normalises hop and cap's berets to not hide hair 2019-07-07 01:44:58 -05:00
Fermi
e84fc73bed Fixed buffers, SDGF, icons and spelling. 2019-07-07 05:59:21 +01: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
Thalpy
cc39c9f896 Merge branch 'master' into master 2019-07-06 16:03:17 +01:00
Ghommie
fe2abc990b Fixes new player runtime that makes people unable to join rounds. 2019-07-06 04:51:56 +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
Fermi
7fa072030b Update to manage prefs. (and so it doesn't do it the wrong way round.) 2019-07-04 23:44:13 +01:00
Fermi
a915821d1a Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 2019-07-04 23:24:39 +01:00
Fermi
ad37ec08b2 Removing slimejelly req from feedback. 2019-07-04 23:24:18 +01:00
Ghommie
3c2e03c247 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit58 2019-07-04 23:46:04 +02:00
Ghommie
eed30d73a9 Ports "Makes ventcrawl much easier on the client" 2019-07-04 23:28:14 +02:00
Ghommie
5ff8be0faa Ports "Adds safer helper for alt-click turf listing" 2019-07-04 22:42:51 +02:00