025b6122d4
short colors
2019-09-12 02:58:34 +02:00
e0a29ec001
Fixing undergarments color resetting each round.
2019-09-12 02:48:26 +02:00
4551b13547
[s] ports tgstation/tgstation#46425
2019-09-11 19:24:05 -04:00
6dfb22ea47
Update preferences_savefile.dm
2019-09-11 17:58:32 -05:00
0ac3a2307d
Update wings.dm
2019-09-11 17:48:57 -05:00
94afbbd560
Adding Horn colors, multiple-select legs, and species squash
...
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking. Sprites tweaked on a bunch of critters. Added new wings....
2019-09-11 17:46:17 -05:00
6b76b09449
Missed 2
2019-09-11 23:30:56 +01:00
fa868ce4ff
fashen crime
2019-09-11 14:22:50 -04:00
c003352d35
Made it 2.5x
2019-09-11 19:08:57 +01:00
db8586950f
Made it 3x
2019-09-11 19:07:40 +01:00
c79c4aafa5
Cleans up var/test into targetReagent
2019-09-11 18:51:05 +01:00
409cbe876a
Okay ACTUALLY does what I want it to.
2019-09-11 18:46:32 +01:00
d59196f430
oops
2019-09-11 16:38:55 +01:00
f50e84a20c
Merge branch 'master' into NeuroFix
2019-09-11 16:24:00 +01:00
29a6f12a4e
Alligns removal rate to be 2x instead of flat.
2019-09-11 15:00:58 +01:00
f2b343518b
Update captain.dm
2019-09-11 02:43:55 -05:00
8988d1e506
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-09-11 02:41:36 -05:00
c13d8678b8
Update bartender.dm
2019-09-11 02:33:50 -05:00
3e72e13174
double checked
2019-09-11 02:33:32 -05:00
ff0c3ee844
Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining
...
The art of drunken captaining
2019-09-10 22:06:36 -07:00
076b6c8699
Merge pull request #9077 from Sishen1542/id-boingo
...
No ID insertion for everything except the hop console
2019-09-10 22:04:48 -07:00
a751a73113
Apply suggestions from code review
...
thx Ceb
Co-Authored-By: cebutris <cebutris2000@gmail.com >
2019-09-10 18:52:49 -04:00
6da9f1c64c
Indent
2019-09-10 21:51:35 +01:00
829a2615c5
Merge pull request #9247 from Thalpy/QuantFix
...
Partially fixes tiny runaway decimals in reagents.
2019-09-10 10:27:40 -07:00
0b581a1ded
Merge branch 'master' into Doggo-sit
2019-09-10 11:02:57 +12:00
6cc92da914
bruh
2019-09-09 18:02:23 -05:00
c824f4a6fe
Fixes Alina's donor sprites and adjusts dark medihound to not trigger the red cross
2019-09-09 20:38:51 +12:00
275457001d
It didnt save my last change
2019-09-08 21:52:28 -04:00
0e12a4f8d1
and swing!
2019-09-08 21:39:32 -04:00
11846849cf
Merge pull request #9249 from Trilbyspaceclone/patch-224
...
Clean bot now cleans Cumstains, glitter, tiny glass shards and more!
2019-09-08 19:49:44 -04:00
7843e070ff
Update mob.dm
2019-09-08 12:13:24 -07:00
d21a45cd53
Doubles stamina regen when laying down/standing
...
Does as named
2019-09-07 20:07:19 -04:00
64b757f404
refactor suits
2019-09-07 17:10:10 -05:00
8f577e910a
Merge pull request #9238 from Trilbyspaceclone/surgery_stuff
...
Adds two more surgerys - Embalming and Body Rejuvenation
2019-09-07 11:37:13 -07:00
09ed526594
Merge pull request #9089 from Sishen1542/rapid-construction-dabvice
...
RCDs can be upgraded to create computer/machine frames, moved deconstruction to the upgrade tier
2019-09-07 11:35:09 -07:00
0f6828e76e
Merge pull request #9224 from kappa-sama/apeserum
...
traitor geneticists can now go ape
2019-09-07 11:27:44 -07:00
c5f3f3d7f9
Merge pull request #9250 from MrJWhit/abductor-spawntext
...
Changes Abductor Spawntext
2019-09-07 11:26:38 -07:00
97072c63c8
Adds text to not disturb the habatat to abductor spawntext
...
Adds "Try not to disturb the habitat, it could lead to dead specimens." to the spawntext.
2019-09-07 13:52:08 -04:00
87cf0b971a
Merge pull request #9221 from Sishen1542/chappy
...
adds some new nullrods with some back end null rod refactors
2019-09-06 16:47:46 -07:00
8c05b4a1d8
*poor cleanbot*
2019-09-06 19:20:32 -04:00
3c38e6eb3d
Update cleanbot.dm
2019-09-06 18:49:42 -04:00
4b0505f691
Merge pull request #9239 from Trilbyspaceclone/patch-222
...
Nerfs earths blood stam regen from 30 - > 13
2019-09-06 11:45:21 -07:00
3e5a192af0
Updates borg examine to also show what module type they are.
2019-09-06 13:31:01 +12:00
cca2001ccb
Fixes dogborgs not using their deadsprite
2019-09-06 12:29:36 +12:00
816ae638a2
[TO_TEST]
2019-09-05 23:19:53 +01:00
29e5c1c10a
Still some residual chems kicking about..!!
2019-09-05 23:15:30 +01:00
fbc2d3c8fe
Ports dogborg sprites from RP to main
...
Includes sit sprites, rest style verb, changing where sit sprites update in robot update_icons so that eye layers get cut properly when resting, etc.
2019-09-06 01:23:53 +12:00
5bc6c9ea04
requested change
2019-09-04 21:18:18 -05:00
d8dee76d28
Merge pull request #9222 from Citadel-Station-13/kevinz000-patch-80
...
TK dusting now uses the proper removal procs to prevent bugs
2019-09-04 20:14:06 -05:00
586eb56977
Merge pull request #9230 from Ghommie/Ghommie-cit191
...
Fixing clockie mass recall that I apparently didn't really fix correctly before.
2019-09-04 19:45:19 -05:00
Ghommie