Commit Graph

9278 Commits

Author SHA1 Message Date
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
Fermi
e3d3f30ea9 Could this be the final commit?! 2019-05-25 16:12:46 +01: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
34cad3786b Reduces stunprod's delay. 2019-05-25 07:35:48 +02:00
Fermi
4b8cb81752 Compile safe. 2019-05-25 05:35:03 +01:00
Fermi
e2c1eb1d7c prebed fixes 2019-05-25 05:27:28 +01: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
Fermi
5e8a20b171 More bugs, to be fixed. 2019-05-25 03:00:31 +01:00
Fermi
faf6585b69 Winding down to the final commits. 2019-05-25 01:04:00 +01: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
Arturlang
661c1d9020 Add fancy colours to the plaintext. 2019-05-24 15:18:38 +03:00
Arturlang
5b2fc29d1f Pumps now let you know when their output is maxed using Alt 2019-05-24 15:08:25 +03:00
Arturlang
5d06de81b6 Fixes inconsistent indentation 2019-05-24 15:00:27 +03:00
BlackMajor
f94cbe94f6 Ports TG firebots 2019-05-24 23:58:39 +12:00
Arturlang
fc54f4b7bf Update mixer.dm 2019-05-24 13:49:24 +03:00
Arturlang
07db00be8f Update filter.dm 2019-05-24 13:48:03 +03:00
Arturlang
e91338f9e3 Update volume_pump.dm 2019-05-24 13:47:23 +03:00
Arturlang
77bfcc61ed Update pump.dm 2019-05-24 13:37:05 +03:00
Arturlang
ea1edd965d Update mixer.dm 2019-05-24 12:18:13 +03:00
Arturlang
277a498f28 Update filter.dm 2019-05-24 12:13:45 +03:00
Arturlang
54e013272a Volume pump CTRL and alt click functionality 2019-05-24 12:12:15 +03:00
Arturlang
a09df34420 Gas pump CTRL and Alt click function 2019-05-24 12:09:14 +03:00
Fermi
05aaeb4d70 Current state 2019-05-24 06:06:25 +01:00
Fermi
b1c11071de Fixed acid to water and funbits. 2019-05-24 01:50:33 +01:00
Fermi
2f7a4082ab woooah. 2019-05-23 23:09:32 +01:00
Useroth
c0cdc4c3ef Update weaponized.dm 2019-05-23 22:49:21 +02:00
Fermi
310344e828 EVERYTHING BROKE AAAAAAAAAAAAAAAAAA 2019-05-23 20:21:52 +01:00
deathride58
cf1acdf058 can my post-testing optimizations please at least work? 2019-05-23 13:12:31 -04:00