Commit Graph

12533 Commits

Author SHA1 Message Date
Poojawa
fbc2b15d21 Make sure the oxygen max doesn't do fucky things 2019-03-21 15:13:11 -05:00
Trilbyspaceclone
e2497cdcf5 Update machine_vending.dm 2019-03-21 16:07:27 -04:00
Poojawa
0ffa3f6670 carbon Oxygen toxicity 2019-03-21 15:05:58 -05:00
Trilbyspaceclone
4b42443dea Update machine_vending.dm 2019-03-21 16:04:35 -04:00
deathride58
974420eb5a Merge pull request #8150 from Trilbyspaceclone/patch-84
MIRROR - Fixes runtime from attempting checking armor on missing bodypart, improves ran_zone selection mechanism #43222
2019-03-21 15:33:34 -04:00
deathride58
e49ef21298 Merge pull request #7984 from Citadel-Station-13/kevinz000-patch-19
Monkey cubes are now baymed tiers of lethal if you eat them raw as a carbon based lifeform.
2019-03-21 15:23:28 -04:00
deathride58
e3248276cd Merge pull request #8127 from Citadel-Station-13/kevinz000-patch-7
cult/clockcult minimum players 20 --> 30 , both cults get one more minimum amount cultists and one more maximum automatic scaled cultist
2019-03-21 15:13:08 -04:00
deathride58
e1496198e4 Merge pull request #8125 from Trilbyspaceclone/Pizza
Anomaly pizza crafting
2019-03-21 15:11:43 -04:00
deathride58
4d64dcd5b9 Merge pull request #8130 from Poojawa/mystery-flavors
Flavor Text is hidden if your face is obscured
2019-03-21 15:10:57 -04:00
deathride58
b900944f8d Merge pull request #8135 from Trilbyspaceclone/KITTY!
Gives RD a multy color pen and the C@ Surgent a NEKO PDA (Yes we have this.)
2019-03-21 15:10:28 -04:00
deathride58
742a99a44c Merge pull request #8132 from Poojawa/taursuit-fixes
Fixes blood overlay and shield issues for taurs
2019-03-21 15:06:57 -04:00
deathride58
8b34aaa458 Merge pull request #8133 from Ragolution/ByeHaveABeautifulTime
Bye have a beautiful time
2019-03-21 15:06:18 -04:00
deathride58
c32c3c0e39 Merge pull request #8137 from Trilbyspaceclone/Tea
Makes strawberry milk and strawberry tea!
2019-03-21 15:04:58 -04:00
kevinz000
f9aa4f8f82 Update forcefieldprojector.dm 2019-03-20 21:41:05 -07:00
kevinz000
6e7f14db52 Update brigdoors.dm 2019-03-20 19:32:17 -07:00
kevinz000
bd86f659c9 Update forcefieldprojector.dm 2019-03-20 19:24:42 -07:00
kevinz000
b20e45d3b7 Update forcefieldprojector.dm 2019-03-20 19:22:25 -07:00
Trilbyspaceclone
bf1c8a5e7d LOCAL CAT CANT DO ANYTHING CORRECT 2019-03-20 21:09:40 -04:00
Trilbyspaceclone
978b5261ce Update packs.dm 2019-03-20 20:54:34 -04:00
Ragolution
ee9368cadb why does ghomme help us
is it because he feels bad for us
real deepthink
2019-03-20 20:08:07 -04:00
Trilbyspaceclone
9d15665cbb Update packs.dm 2019-03-20 17:12:05 -04:00
Trilbyspaceclone
d04606acb1 SHIFT CLICK CAT DO THE THING THAT PROPERLY DOSE THE THING 2019-03-20 16:21:45 -04:00
Trilbyspaceclone
c774287e2b Update mob_helpers.dm 2019-03-20 16:06:01 -04:00
Trilbyspaceclone
2931e52777 woops! 2019-03-20 16:02:42 -04:00
Trilbyspaceclone
6667a89a0a Update mob_helpers.dm 2019-03-20 16:02:07 -04:00
Trilbyspaceclone
ef58b35603 Update human_defense.dm 2019-03-20 15:57:14 -04:00
Ragolution
793a8c5c44 QoL naming changes
It's MY CODE NOW, TRILBY. YOU CAN'ST STOPP ME
2019-03-20 01:42:18 -04:00
Ragolution
81ba8ff40b Update vent_clog.dm
Works locally, like this. Fuck if I know.
2019-03-19 23:55:37 -04:00
deathride58
4761d9d7f3 Makes OOC and LOOC actually use different toggles 2019-03-19 20:18:15 -04:00
deathride58
357d90433f Makes panic bunker interactions be logged in IRC 2019-03-19 19:43:36 -04:00
deathride58
09f77d0438 Nerfs dinks - Ballistic projectiles are now the only projectiles that can emit a dink 2019-03-18 23:02:07 -04:00
deathride58
8f782da23e attempts to resolve serverside lag with high playercounts by adding a sanity check to mouse movements 2019-03-18 21:59:42 -04:00
Trilbyspaceclone
4699d83801 the icons damn it! 2019-03-18 20:24:57 -04:00
Trilbyspaceclone
c321e44319 Update drink_reagents.dm 2019-03-18 20:20:24 -04:00
Trilbyspaceclone
8d213cb1c6 Update drinks_recipes.dm 2019-03-18 19:45:51 -04:00
Trilbyspaceclone
830bfff180 Update PDA_types.dm 2019-03-18 17:45:26 -04:00
Trilbyspaceclone
026bf39929 NYA~ 2019-03-18 17:31:03 -04:00
Ragolution
7b26e7038a Merge branch 'master' into BadWording 2019-03-18 16:30:01 -04:00
Ragolution
9cb4265675 Improves operation console stuff
Changes confusing wording on Optable console
2019-03-18 16:22:18 -04:00
Ragolution
b874662323 Enables new sound.
Why the fuck is this in the ticker subsystem?
2019-03-18 08:54:04 -04:00
Poojawa
25d079c4b8 Fixes blood overlay and shield issues for taurs 2019-03-18 03:19:18 -05:00
Poojawa
fb1b76cafe compiles but I don't feel like spriting atm 2019-03-18 02:00:00 -05:00
nik707
19a674ab1f Merge pull request #8122 from deathride58/fixesheadstamloss
Fixes staminaloss targeted at the head not redirecting to the chest
2019-03-18 00:30:37 -05:00
kevinz000
461d42ae6b Update ticker.dm 2019-03-17 22:18:13 -07:00
kevinz000
39397ea938 Update shuttle.dm 2019-03-17 22:17:30 -07:00
kevinz000
079264bf93 Update communications.dm 2019-03-17 22:16:44 -07:00
Poojawa
abc0936256 hide flavors 2019-03-17 05:00:14 -05:00
kevinz000
4a2165f198 Merge pull request #8113 from Ragolution/Abductor-Advanced-Surgery
Allows Abductors to revive their dead agent, granted they recover the body.
2019-03-16 15:53:39 -07:00
kevinz000
8151d504c6 Merge pull request #8119 from deathride58/properlyfixesigniters
Properly fixes igniters by increasing the max hotspot expose temperature for sparks to 700 from 300
2019-03-16 15:53:20 -07:00
kevinz000
5e6e651869 eh fuck it revs can stay 2019-03-16 15:50:42 -07:00