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
bfbf9f2492
Merge pull request #9254 from Citadel-Station-13/gloria-plushie
...
Adds Gloria Redwood plushie as well as heichou's plushies.
2019-09-08 19:47:50 -04:00
7843e070ff
Update mob.dm
2019-09-08 12:13:24 -07:00
9f275ebf01
Ports trim decals
...
## About The Pull Request
So smooth, so helpful. These decals can be used to point newer players to departments, or as trim to border departments.
## Changelog
🆑
add: Trim lines!
/🆑
2019-09-08 10:51:05 -06:00
3e9d37e70d
Update plushes.dm
2019-09-07 17:13:21 -07:00
d21a45cd53
Doubles stamina regen when laying down/standing
...
Does as named
2019-09-07 20:07:19 -04:00
b8374feafd
Update plushes.dm
2019-09-07 17:03:06 -07:00
64b757f404
refactor suits
2019-09-07 17:10:10 -05:00
20ea620e9e
literally why even
2019-09-07 16:46:25 -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
e71dad4ecc
Merge pull request #9242 from kappa-sama/bootcult
...
cultist boot cultist boot?
2019-09-06 11:45:56 -07: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
dab0829da8
normalizes head roles not rolling the more common antags (wiz is kept)
2019-09-06 04:50:20 -04: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
0cf1415969
[SPEEDMERGE] Glass Machine :b:roke
2019-09-05 16:28:18 +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
364d05e2b7
paxton going ape
2019-09-04 20:48:46 -04:00
599634496e
paxton told me to do this or else he'd go ape
2019-09-04 20:46:50 -04: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
876232c1bc
cultist boot cultist boot?
2019-09-04 20:38:51 -04:00
f4ed7d04f0
help screen
2019-09-04 14:19:14 -05:00
dbdaae83b6
Update medicine_reagents.dm
2019-09-04 13:29:58 -04:00
eee1ccbe2c
merge oracle ui from kepler
2019-09-04 11:42:04 -05:00
084b37ae4e
tada
2019-09-04 10:13:32 -04:00
d431ee1a20
baseball bat
2019-09-04 03:01:47 -04:00
9ec97579bd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147
2019-09-03 21:08:09 +02:00
fd585aa6ea
Merge branch 'master' into more_cooking2
2019-09-03 11:22:38 -04:00
5eba0d55f9
Update trash.dm
2019-09-03 11:09:03 -04:00
7476f117da
pie
2019-09-03 10:45:33 -04:00
8394f2f1c7
grammer
2019-09-03 10:44:59 -04:00
3f957ea488
grammer
2019-09-03 10:43:29 -04:00
5168f2b233
Update granters.dm
2019-09-03 07:37:37 -04:00
807f7f4771
completely removes autoscan as originally intended
2019-09-03 06:03:46 +00:00
fbcce02f78
still removes autoscan
2019-09-03 05:44:51 +00:00
c616c0e288
Update food_reagents.dm
2019-09-02 20:00:38 -04:00
44c15897c7
Merge pull request #9209 from Sishen1542/ass-ass-ass
...
Adds support for trit, bz, and pluox to the SM
2019-09-02 18:37:42 -05:00
Trilbyspaceclone