Commit Graph

13165 Commits

Author SHA1 Message Date
Ghommie
7289d8a999 tweaking. 2019-05-26 06:31:25 +02:00
BurgerLua
125db4c6b4 Added 2019-05-25 21:21:52 -07:00
Ghommie
9b2ab8fc2a 21 minutes sounds, I don't really wanna overly punish. 2019-05-26 05:21:17 +02:00
Ghommie
e61942cba9 it will approx take 18-19 minutes now. 2019-05-26 05:18:07 +02:00
Ghommie
28c435134b stunbaton emp & status tweaks 2019-05-26 04:52:05 +02:00
UntoldTactics
49351fe909 Update code/modules/antagonists/cult/runes.dm
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-05-26 12:23:35 +10:00
Ghom
b2eea5e3f4 Sorry, web edit because I didn't commit the ?. 2019-05-26 04:11:52 +02:00
Ghommie
2fe1431db6 Applying suggestion, ?. so no theorical runtime. 2019-05-26 03:40:48 +02:00
Arturlang
869fac49a7 Apply suggestions from code review
Fixes compile errors

Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
2019-05-26 03:29:27 +03:00
Trilbyspaceclone
070e43ca64 Update sheet_types.dm 2019-05-25 17:58:33 -04:00
Trilbyspaceclone
b6590cd9e9 Update boxes.dm 2019-05-25 17:54:57 -04:00
Trilbyspaceclone
ed974bdcde Update sheet_types.dm 2019-05-25 17:18:40 -04:00
Trilbyspaceclone
c8734cebdc Update biogenerator_designs.dm 2019-05-25 16:35:50 -04:00
deathride58
4fc31f6322 Merge branch 'master' into fuckatmos 2019-05-25 15:34:06 -04:00
CalamaBanana
fc5b617ca0 Input-check for the color 2019-05-25 21:18:17 +02:00
kevinz000
0dba89c4e7 Merge pull request #8325 from Trilbyspaceclone/patch-118
[Ready] Cleaner looking autolathen organization
2019-05-25 11:51:17 -07:00
kevinz000
90a3199315 Merge pull request #8417 from Trilbyspaceclone/patch-136
Gives space queen's men void jet packs + tweeks
2019-05-25 11:34:55 -07:00
kevinz000
a4b2aa0420 Merge pull request #8296 from Trilbyspaceclone/patch-112
Nerfs Synda NPC block Rng to 25%
2019-05-25 11:31:30 -07:00
kevinz000
d0819246bc Merge pull request #8384 from nero1024/footstepB
Ports new footstep sounds from base /tg/
2019-05-25 11:30:57 -07:00
kevinz000
e434b9ceb5 Merge pull request #8397 from WhiteHusky/arousal-related-styling-fixes
Changed arousal message styling.
2019-05-25 11:30:18 -07:00
kevinz000
deffcb3226 Merge pull request #8398 from BurgerLUA/AntiAssSlap
Nerfs Ass Slapping, or how a meme PR made me butthurt, or how I'm now resorting to making degenerate PRs such as this since my permaban from Aurora
2019-05-25 11:28:39 -07:00
kevinz000
aab5a4ae0a Merge pull request #8407 from Poojawa/sprite-fixing
Female Gendered markings and leg sprite fixes
2019-05-25 11:20:23 -07:00
kevinz000
e8742a4937 Merge pull request #8402 from CdrCross/AdvDefibProofread
Defibrillator Upgrades Proofread
2019-05-25 11:17:34 -07:00
kevinz000
97609fb84e Merge pull request #8409 from Poojawa/why-is-arousal-code-is-bad
Fixes species getting genitals at all if NOGENITAL'd
2019-05-25 11:13:55 -07:00
kevinz000
16310a9aea Merge pull request #8425 from BlackMajor/Dunga
Ports TG firebots.
2019-05-25 11:13:29 -07:00
kevinz000
104d3c1f37 Merge pull request #8420 from deathride58/fixesblobs
Fixes shield blobs being completely invulnerable to all forms of damage after reaching a weakened state.
2019-05-25 11:10:19 -07:00
Ghommie
d8024ef36f lazyinitlist. 2019-05-25 16:32:17 +02:00
Arturlang
08bb998cf3 Fixes some oofs 2019-05-25 14:06:45 +03:00
Arturlang
749e3a6f6a Apply suggestions from code review
Added logging as suggested by Poojawa

Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
2019-05-25 14:01:55 +03:00
Arturlang
96ab12cb48 Update code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
2019-05-25 13:59:35 +03:00
Ghommie
0a1a7260cb no swapping places with lying mobs, thanks. 2019-05-25 10:04:04 +02:00
Ghommie
9864fe275d I'm tired of my grabs on horizontal spacemen breaking off because of cit crawling. 2019-05-25 08:22:27 +02:00
Ghommie
521c371253 actually, let's just halve it, won't be an issue I suppose. 2019-05-25 07:44:45 +02:00
Ghommie
34cad3786b Reduces stunprod's delay. 2019-05-25 07:35:48 +02:00
Trilbyspaceclone
d1887d2431 Update comp_board_designs_medical.dm 2019-05-24 23:05:47 -04:00
Trilbyspaceclone
633bea1ad2 Update machine_designs_sci.dm 2019-05-24 22:56:44 -04:00
Trilbyspaceclone
a43e4a6ca1 Update machine_designs_medical.dm 2019-05-24 22:55:59 -04:00
Trilbyspaceclone
1ff9489901 Update machine_designs_sci.dm 2019-05-24 22:37:59 -04:00
Trilbyspaceclone
a0ee1aaccb Poojawa hissy fit for a game they dont even play.
Out Standing Move
2019-05-24 22:35:05 -04:00
Trilbyspaceclone
61605443b5 Update rifle.dm 2019-05-24 22:18:53 -04:00
Trilbyspaceclone
f5d4135fe9 Update automatic.dm 2019-05-24 22:14:17 -04:00
Trilbyspaceclone
5b6f324993 Update shotgun.dm 2019-05-24 22:13:16 -04:00
Trilbyspaceclone
180666f519 Update recipes.dm 2019-05-24 22:11:11 -04:00
deathride58
9d240d3375 [s] fixes concatenator circuits being able to crash the server 2019-05-24 13:37:53 -04:00
CalamaBanana
d9cc539948 Removed color whitelist 2019-05-24 17:46:48 +02:00
Sishen
d082479ccb Slimespeak! 2019-05-24 08:48:03 -04:00
Arturlang
9e025a03bd Ditto
Adds output max confirmation, removes unneeded icon update
2019-05-24 15:23:54 +03:00
Arturlang
7b82ce463b Ditto
Removes icon update, adds text confirmation to maxed pump in filter
2019-05-24 15:23:10 +03:00
Arturlang
40e90d1e34 Adds volume pump max text, as unlikely as it may be. Removes unnecesary icon update. 2019-05-24 15:21:40 +03:00
Arturlang
5a7ab390ce Gah, forgot to do spacing 2019-05-24 15:20:36 +03:00