49f1176170
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2019-12-30 16:06:16 +01:00
9653dc470b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into autoooc
2019-12-30 22:48:39 +08:00
6e506c949e
Merge pull request #10348 from Putnam3145/radiation
...
fix divide by 0 runtime in new contam
2019-12-30 11:08:52 +01:00
a6e72c8cad
ok
2019-12-30 11:00:21 +01:00
418e4c21ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole
2019-12-30 01:56:59 -08:00
6e9d13e48f
Replace the cryopod with a simple ghost button.
2019-12-30 01:52:06 -08:00
f2759abb4c
fixed a runtime
2019-12-30 01:18:05 -08:00
90ebbdfdb9
elements are so good. they're so good
2019-12-30 00:53:03 -08:00
d1434c767c
Merge pull request #10335 from kappa-sama/patch-12
...
mouth slice
2019-12-30 00:11:38 -08:00
74edd7b13f
Merge pull request #10243 from Putnam3145/lewdchem-better-options
...
Lewd chem sanity pass/"ERP preferences"
2019-12-30 00:09:18 -08:00
1b7e9c6716
wow divide by 0 very cool
2019-12-29 22:03:23 -08:00
edd05cebea
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
2019-12-30 00:28:36 +01:00
baf8b28f3a
Fixes Reduced Diagnostics and adds disks
...
Fixes reduced diagnostics not working properly and adds program disks for each of the new nanites.
2019-12-29 16:03:38 -05:00
3d3407363c
auto ooc
2019-12-29 18:48:00 +08:00
3fad4edae0
mouth
2019-12-28 23:57:07 -05:00
7837688426
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2019-12-28 23:41:10 +01:00
390cfd8b64
Nanite ports from /tg/
...
Ports a couple of the newer nanite features from /tg/
2019-12-28 16:56:17 -05:00
2ad4698225
Merge pull request #10217 from Putnam3145/radiation
...
Nerfing radioactive contamination
2019-12-28 17:21:25 +01:00
d562a5ba27
Merge pull request #10212 from Ghommie/Ghommie-cit471
...
Ports some hud and update_icon code updates.
2019-12-28 04:07:03 +00:00
93248336ea
Merge pull request #10265 from Trilbyspaceclone/map_redo
...
Cit-iftyed Box map as well as adding back blasters back to armory
2019-12-27 22:54:35 +01:00
21cfb2914b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2019-12-27 17:49:59 +01:00
88222c0901
uh, actually did that
2019-12-24 23:58:22 -08:00
a106fde6cc
a few fixes here and there and updating it
2019-12-24 23:38:27 +08:00
85c5a5dfa1
Merge branch 'rising_bass' of https://github.com/Seris02/Citadel-Station-13 into rising_bass
2019-12-24 22:29:46 +08:00
9e6f0762b7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into rising_bass
2019-12-24 22:27:41 +08:00
ec0596c404
Update
2019-12-23 18:52:33 -05:00
d571bbd292
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2019-12-24 00:07:32 +01:00
9a022f21eb
Merge pull request #10245 from r4d6/substationV2
...
Make Box's Engine be randomised between SM, Tesla and Singulo V2 [TEST-MERGE]
2019-12-23 18:58:26 +01:00
e74339ce8b
Jfc that's a lot of work!
2019-12-23 04:24:13 +01:00
c7dbdd73df
Merge branch 'master' into donut
2019-12-22 02:36:57 -05:00
395457f7ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471
2019-12-21 17:59:32 +01:00
aea2b8865e
Merge pull request #10120 from Citadel-Station-13/night_vision
...
Night vision trait but it just boosts barely-lit visibility
2019-12-21 15:30:32 +01:00
c5aef98252
Make things even more organized
2019-12-21 09:17:15 -05:00
fb078e18f9
QoL Update
...
Move the Engines to a subfolder to be cleaner when there will be 20 submaps on different maps and change the Tesla Submap to incorporate a few changes I did for the Singulo submap.
2019-12-21 09:12:04 -05:00
19fc981cc1
Merge pull request #9596 from Linzolle/abductor-update
...
Bring abductors up-to-date with /tg/.
2019-12-21 11:15:29 +01:00
758e66ac2d
yeah alcohol intolerance
2019-12-20 16:46:38 -08:00
c810145fc1
also adds aphrodisiacs, slaps, all hypno as prefs
2019-12-20 14:47:09 -08:00
4016835b0a
Merge pull request #9798 from Citadel-Station-13/kevinz000-patch-114
...
Radiation storms no longer do random mutations in of itself, but are far more lethal
2019-12-20 14:32:42 +01:00
481371bca7
Merge pull request #10193 from Commandersand/yeet
...
gamer is now filtered for clowns
2019-12-20 13:15:54 +01:00
61a702bad5
Merge remote-tracking branch 'upstream/master' into substationV2
2019-12-19 23:51:14 -05:00
4608b3852d
Add the file for making the submaps actual ruins
2019-12-19 15:28:46 -05:00
f2b46f0951
ROBUST OPTING MECHANICS
2019-12-19 11:14:02 -08:00
70e50e57cd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-12-17 20:21:49 -06:00
0f5c8db456
Merge branch 'master' into donut
2019-12-17 15:12:51 -05:00
b8c5290011
Merge pull request #10026 from Linzolle/neck-slice
...
Neck slice
2019-12-17 11:58:00 -08:00
ed44b3130c
Merge pull request #10172 from Ghommie/Ghommie-cit460
...
Porting several quirks code updates.
2019-12-17 11:51:03 -08:00
ef750e8ace
contamination nerf
2019-12-16 18:54:59 -08:00
6b7dcbceb0
Porting a few martial art code updates.
2019-12-17 03:19:07 +01:00
237fbaa02d
Merge pull request #10180 from Ghommie/Ghommie-cit462
...
[s] virtual reality component improvements, fixes and documentation.
2019-12-17 01:05:10 +00:00
80402a0d88
Ports some hud and update_icon code updates.
2019-12-16 23:29:20 +01:00
Ghommie