 MrJWhit
|
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 |
|
|
kevinz000
|
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 |
|
|
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
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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
|
7476f117da
|
pie
|
2019-09-03 10:45:33 -04:00 |
|
|
Trilbyspaceclone
|
8394f2f1c7
|
grammer
|
2019-09-03 10:44:59 -04:00 |
|
|
Sishen
|
a3967b6f77
|
aaaaaaaa
|
2019-09-03 02:29:08 -04: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
|
dd7907c3d7
|
Merge pull request #9057 from EgoSumStultus/male-AI-vox
Adds the Male AI vox voice.
|
2019-09-02 18:27:03 -05:00 |
|
|
TrilbySpaceClone
|
71aeddd6f6
|
Packbrakeout
|
2019-09-02 11:17:55 -04:00 |
|
|
Sishen
|
3f954f10a7
|
Update runes.dm
|
2019-09-02 02:09:59 -04:00 |
|
|
Trilbyspaceclone
|
473cde6a9d
|
huh
|
2019-08-31 21:16:14 -04:00 |
|
|
TrilbySpaceClone
|
c2f189bbdb
|
Merge branch 'master' into fruit
|
2019-08-31 21:09:59 -04:00 |
|
|
Ghommie
|
db3c36fd9a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-09-01 01:59:00 +02:00 |
|
|
Ghommie
|
4085b479d1
|
Fixing clockie mass recall that I apparently didn't really fix before.
|
2019-09-01 01:45:33 +02:00 |
|
|
Sishen
|
b4f27b8841
|
allows renaming of non null rod holyweapons, fixes hypertool description
|
2019-08-31 18:05:09 -04:00 |
|
|
Sishen
|
279a6ed83e
|
bibles now destroy runes instead of nullrods, due to holy weapons encompassing more typepaths
|
2019-08-31 17:57:36 -04:00 |
|
|
Sishen
|
d9fff579b1
|
damage and stamina balances
|
2019-08-31 17:39:51 -04:00 |
|
|
TrilbySpaceClone
|
36695d556f
|
Lets have all the ammo and kegs together
|
2019-08-31 15:38:26 -04:00 |
|
|
nik707
|
e943cf0ae8
|
Merge pull request #9219 from Trilbyspaceclone/patch-219
Ports "Fixes slimes not feeding #44760"
|
2019-08-31 02:09:15 -05:00 |
|
|
nik707
|
c826e1b412
|
Merge pull request #9175 from lolman360/master
[READY] Adds durathread jumpskirts, rolled down jumpsuits and PROBABLY FIXES SPRITES
|
2019-08-31 02:06:33 -05:00 |
|
|
Sishen
|
ba5021af5b
|
gives lasrifle the damage component, turns kevs divine lightblade into a hypereut to balance stats, adds hypertool
|
2019-08-31 02:55:29 -04:00 |
|