 Trilbyspaceclone
|
8c05b4a1d8
|
*poor cleanbot*
|
2019-09-06 19:20:32 -04:00 |
|
|
Trilbyspaceclone
|
3c38e6eb3d
|
Update cleanbot.dm
|
2019-09-06 18:49:42 -04:00 |
|
|
kevinz000
|
e71dad4ecc
|
Merge pull request #9242 from kappa-sama/bootcult
cultist boot cultist boot?
|
2019-09-06 11:45:56 -07:00 |
|
|
kevinz000
|
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 |
|
|
Sishen
|
dab0829da8
|
normalizes head roles not rolling the more common antags (wiz is kept)
|
2019-09-06 04:50:20 -04:00 |
|
|
BlackMajor
|
3e5a192af0
|
Updates borg examine to also show what module type they are.
|
2019-09-06 13:31:01 +12:00 |
|
|
BlackMajor
|
cca2001ccb
|
Fixes dogborgs not using their deadsprite
|
2019-09-06 12:29:36 +12:00 |
|
|
Fermi
|
816ae638a2
|
[TO_TEST]
|
2019-09-05 23:19:53 +01:00 |
|
|
Fermi
|
29e5c1c10a
|
Still some residual chems kicking about..!!
|
2019-09-05 23:15:30 +01:00 |
|
|
Fermi
|
d90b4769f1
|
MK, SDGF, Astrogen, Eigen, BE, furranium, hattmium tweaks and fixes.
|
2019-09-05 22:30:53 +01:00 |
|
|
Linzolle
|
b36caabfe6
|
taur fixes
|
2019-09-05 12:47:55 -05:00 |
|
|
Chayse Ramsay
|
0cf1415969
|
[SPEEDMERGE] Glass Machine :b:roke
|
2019-09-05 16:28:18 +01:00 |
|
|
BlackMajor
|
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 |
|
|
Trilbyspaceclone
|
a68f35723f
|
Update clothesmate.dm
|
2019-09-05 06:45:22 -04:00 |
|
|
Trilbyspaceclone
|
b85ff2c5a2
|
Update nutrimax.dm
|
2019-09-05 06:44:59 -04:00 |
|
|
Trilbyspaceclone
|
57fd7388d3
|
Update nutrimax.dm
|
2019-09-05 06:44:37 -04:00 |
|
|
Trilbyspaceclone
|
c0c23fcc43
|
Update wardrobes.dm
|
2019-09-05 06:43:41 -04:00 |
|
|
Trilbyspaceclone
|
0a43c2b64d
|
Update recipes_clothing.dm
|
2019-09-05 06:42:41 -04:00 |
|
|
Linzolle
|
5bc6c9ea04
|
requested change
|
2019-09-04 21:18:18 -05:00 |
|
|
nik707
|
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 |
|
|
kappa-sama
|
364d05e2b7
|
paxton going ape
|
2019-09-04 20:48:46 -04:00 |
|
|
kappa-sama
|
599634496e
|
paxton told me to do this or else he'd go ape
|
2019-09-04 20:46:50 -04:00 |
|
|
nik707
|
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 |
|
|
kappa-sama
|
876232c1bc
|
cultist boot cultist boot?
|
2019-09-04 20:38:51 -04:00 |
|
|
Fermi
|
f1f762ef48
|
Darnit bobby
|
2019-09-04 21:45:55 +01:00 |
|
|
Linzolle
|
f4ed7d04f0
|
help screen
|
2019-09-04 14:19:14 -05:00 |
|
|
Trilbyspaceclone
|
dbdaae83b6
|
Update medicine_reagents.dm
|
2019-09-04 13:29:58 -04:00 |
|
|
Alonefromhell
|
eee1ccbe2c
|
merge oracle ui from kepler
|
2019-09-04 11:42:04 -05:00 |
|
|
TrilbySpaceClone
|
084b37ae4e
|
tada
|
2019-09-04 10:13:32 -04:00 |
|
|
Sishen
|
d431ee1a20
|
baseball bat
|
2019-09-04 03:01:47 -04:00 |
|
|
Fermi
|
91cace6812
|
Merge remote-tracking branch 'upstream/master' into FERMICHEMCurTweaks
|
2019-09-03 20:33:33 +01:00 |
|
|
Fermi
|
7890ad08d5
|
what is this
|
2019-09-03 20:30:21 +01:00 |
|
|
Fermi
|
a605d2a776
|
Todo: finish new words and review langauge
|
2019-09-03 20:16:41 +01:00 |
|
|
Ghommie
|
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 |
|
|
TrilbySpaceClone
|
fd585aa6ea
|
Merge branch 'master' into more_cooking2
|
2019-09-03 11:22:38 -04:00 |
|
|
Trilbyspaceclone
|
5eba0d55f9
|
Update trash.dm
|
2019-09-03 11:09:03 -04:00 |
|
|
Trilbyspaceclone
|
7476f117da
|
pie
|
2019-09-03 10:45:33 -04:00 |
|
|
Trilbyspaceclone
|
8394f2f1c7
|
grammer
|
2019-09-03 10:44:59 -04:00 |
|
|
Trilbyspaceclone
|
3f957ea488
|
grammer
|
2019-09-03 10:43:29 -04:00 |
|
|
Trilbyspaceclone
|
5168f2b233
|
Update granters.dm
|
2019-09-03 07:37:37 -04:00 |
|
|
Sishen
|
a3967b6f77
|
aaaaaaaa
|
2019-09-03 02:29:08 -04:00 |
|
|
YakumoChen
|
807f7f4771
|
completely removes autoscan as originally intended
|
2019-09-03 06:03:46 +00:00 |
|
|
YakumoChen
|
fbcce02f78
|
still removes autoscan
|
2019-09-03 05:44:51 +00:00 |
|
|
Trilbyspaceclone
|
c616c0e288
|
Update food_reagents.dm
|
2019-09-02 20:00:38 -04:00 |
|
|
nik707
|
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 |
|
|
nik707
|
2fe5571887
|
Merge pull request #9212 from dapnee/plasmaglass-tables-spears
Plasmaglass Tables, Spears, Shards (Take 2)
|
2019-09-02 18:37:22 -05:00 |
|
|
nik707
|
67f4276aab
|
Merge pull request #9104 from Sishen1542/tbaton
classic & telebaton no longer have attack delay
|
2019-09-02 18:35:56 -05:00 |
|
|
nik707
|
ca8166f940
|
Merge pull request #9041 from Citadel-Station-13/kevinz000-patch-68
Buffs cult/clockcult wall explosion_block
|
2019-09-02 18:28:05 -05:00 |
|
|
nik707
|
dd7907c3d7
|
Merge pull request #9057 from EgoSumStultus/male-AI-vox
Adds the Male AI vox voice.
|
2019-09-02 18:27:03 -05:00 |
|
|
nik707
|
3ea520d443
|
Merge pull request #8649 from Ghommie/Ghommie-cit50
Increases the default space ruin z-level count to 2
|
2019-09-02 18:25:30 -05:00 |
|