Trilbyspaceclone
|
7c4fab127f
|
Update necropolis_chests.dm
|
2019-12-09 15:37:22 -05:00 |
|
Putnam3145
|
01bb9d79d9
|
Merge pull request #10114 from r4d6/n2o-pressure-tank
Add a N2O Pressure Tank
|
2019-12-09 12:33:03 -08:00 |
|
Artur
|
488c0f1833
|
Mindshield fix and thrall buff
|
2019-12-09 19:08:42 +02:00 |
|
Putnam
|
54162947bc
|
Also takes into account external temp (radiation coming back in, specifically)
|
2019-12-09 07:10:01 -08:00 |
|
kappa-sama
|
f790d675d9
|
flavor text
|
2019-12-09 09:06:11 -05:00 |
|
Putnam
|
75d8be980a
|
atmos tweaks
|
2019-12-09 02:00:58 -08:00 |
|
kevinz000
|
20defaba8e
|
Update conveyor2.dm
|
2019-12-08 21:46:53 -07:00 |
|
kappa-sama
|
e111429a30
|
the hippie thing
|
2019-12-08 23:37:33 -05:00 |
|
kevinz000
|
c0f8a42e0f
|
Update eyes.dm
|
2019-12-08 19:49:15 -07:00 |
|
kevinz000
|
c38f4989be
|
Update eyes.dm
|
2019-12-08 19:45:27 -07:00 |
|
Ghommie
|
414d4b7a90
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408
|
2019-12-09 00:04:22 +01:00 |
|
Artur
|
d184bdd77a
|
Whoops
|
2019-12-08 22:22:30 +02:00 |
|
Linzolle
|
1e2a4f606c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
|
2019-12-08 14:17:00 -06:00 |
|
Lin
|
ef01bbd222
|
Merge pull request #10075 from Ghommie/Ghommie-cit436
Demodularize defib disks and projectiles icons.
|
2019-12-08 20:15:01 +00:00 |
|
Lin
|
9c7ac9a469
|
Merge pull request #10071 from Ghommie/Ghommie-cit434
Fixes bubblegum's death not unlocking the arena shuttle buyment since the medals subsystem is not hub enabled
|
2019-12-08 20:01:50 +00:00 |
|
Artur
|
9773b530f8
|
More fixes. Urgh
|
2019-12-08 21:47:25 +02:00 |
|
Useroth
|
1d0438800e
|
Touched up a copy-paste leftover.
|
2019-12-08 17:04:11 +01:00 |
|
Useroth
|
ea4f57beb6
|
Spaghettid my way around the errors.
|
2019-12-08 16:47:21 +01:00 |
|
r4d6
|
2eca1657ab
|
Add a N2O Pressure Tank
|
2019-12-08 08:54:50 -05:00 |
|
Useroth
|
5e836c51e4
|
Forgot to track the new files
|
2019-12-08 14:05:05 +01:00 |
|
Useroth
|
a37f2de71d
|
First step of porting lavaland tumors. Looks like Cita is much behind tg regarding simplemobs.
|
2019-12-08 14:00:08 +01:00 |
|
kappa-sama
|
cdda28f85c
|
tabs
|
2019-12-08 03:54:55 -05:00 |
|
kappa-sama
|
48be47d4d1
|
yes?
|
2019-12-08 03:54:29 -05:00 |
|
kappa-sama
|
52a050e9ee
|
maybe
|
2019-12-08 03:54:02 -05:00 |
|
kappa-sama
|
b015d2571a
|
==?
|
2019-12-08 03:51:36 -05:00 |
|
kappa-sama
|
10c844e70d
|
does this even work
|
2019-12-08 03:36:09 -05:00 |
|
Hatterhat
|
379a01c3fe
|
packin some more doo dee doo
|
2019-12-08 01:42:56 -06:00 |
|
Hatterhat
|
6ff7083bfb
|
the one where i buff a 4 tc item, give trilby a (You), and squash my commits
|
2019-12-08 01:29:08 -06:00 |
|
Lin
|
24e4673c2b
|
Merge pull request #10057 from Ghommie/Ghommie-cit431
fixes on_mob eyes overlays not updating properly in certain cases.
|
2019-12-07 21:49:18 +00:00 |
|
Thalpy
|
f59bdbe14e
|
Tweaks botany related ragent pHes so they're less likely to blow up.
|
2019-12-07 17:42:29 +00:00 |
|
Thalpy
|
60c555c7e1
|
Merge branch 'master' into Superbases-goodbye
|
2019-12-07 17:37:05 +00:00 |
|
Putnam3145
|
cece6dd43d
|
Merge pull request #10098 from Ghommie/Ghommie-cit445
Fixes a lil issue with ice cream cones.
|
2019-12-07 08:48:21 -08:00 |
|
Useroth
|
c35acf00fe
|
Empty commit to make travis recompile.
|
2019-12-07 15:18:37 +01:00 |
|
Artur
|
4711eb0987
|
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
|
2019-12-07 15:53:11 +02:00 |
|
Useroth
|
28ddfd29b6
|
Merge branch 'master' into new-tg-plants
|
2019-12-07 14:25:38 +01:00 |
|
Ghommie
|
d38475f06d
|
i'm tired of this
|
2019-12-07 12:05:12 +01:00 |
|
Trilbyspaceclone
|
156b7cabb1
|
Update recipes_misc.dm
|
2019-12-07 04:41:28 -05:00 |
|
kevinz000
|
c706720dd1
|
Merge pull request #9912 from Owai-Seek/cargocleanupv2boogaloo
Added 15+ new crates, fixed issues raised in #9901
|
2019-12-07 01:52:35 -07:00 |
|
Trilbyspaceclone
|
7ab66fd2e2
|
no wounder why I didnt push it, it never complied
|
2019-12-07 03:50:20 -05:00 |
|
Trilbyspaceclone
|
6faad2e30b
|
Update recipes_misc.dm
|
2019-12-07 03:46:25 -05:00 |
|
Useroth
|
5f56d40f58
|
Incorporated the bamboo grammar fixes.
|
2019-12-07 06:41:24 +01:00 |
|
Ghommie
|
7cc332960b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
|
2019-12-07 05:30:07 +01:00 |
|
Ghommie
|
0a0094e80c
|
Fixes stuff I broke with my coding extravaganza.
|
2019-12-07 05:11:29 +01:00 |
|
Ghommie
|
9152fe49e6
|
Typo.
|
2019-12-07 04:49:18 +01:00 |
|
Ghommie
|
b9751006bb
|
Fixes reviver implant having been a crapshot ever since soft-crit was introduced years ago.
|
2019-12-07 04:46:54 +01:00 |
|
nik707
|
e4a41c6169
|
Merge pull request #9932 from Putnam3145/fix-genital-contam
Make organs no longer radiaoctively contaminable.
|
2019-12-06 20:37:53 -06:00 |
|
Ghommie
|
019ab63e09
|
Fixes reactive armor onmob overlays not updating when toggled and reactive teleport armor still using forceMove()
|
2019-12-07 02:06:51 +01:00 |
|
Unknown
|
97e686cf23
|
Merge branch 'master' into xantholne-christmas01
|
2019-12-06 17:21:08 -07:00 |
|
Ghommie
|
3d42744d8a
|
conflict with a certain framework for tech node discounts or something I guess.
|
2019-12-07 00:38:32 +01:00 |
|
Ghommie
|
7cb2092fcb
|
typo
|
2019-12-07 00:04:05 +01:00 |
|