Hatterhat
|
7c98656939
|
upstream merge
|
2020-01-04 01:48:50 -06:00 |
|
Hatterhat
|
186194418e
|
tg 43454+43688 port, tweaks w/ trilby, db crate
|
2020-01-04 01:33:32 -06:00 |
|
kevinz000
|
031f485e4d
|
updates
|
2020-01-02 23:24:47 -08:00 |
|
Putnam
|
adf87c7595
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole
|
2020-01-02 22:52:24 -08:00 |
|
Ghommie
|
4d06d231f8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-02 17:49:01 +01:00 |
|
r4d6
|
25c92b0fd7
|
fix number.
|
2020-01-02 02:13:10 -05:00 |
|
r4d6
|
91a8a434f5
|
Fix a bug and allow for the three crystals to be hit.
|
2020-01-02 01:58:34 -05:00 |
|
r4d6
|
0fad4aff75
|
change a x of place to make more sense.
|
2020-01-02 01:34:17 -05:00 |
|
r4d6
|
4010d72b7a
|
Add 3 SM Variations
|
2020-01-02 01:31:21 -05:00 |
|
Linzolle
|
74c308c16c
|
runtime fix
|
2020-01-01 22:23:16 -06:00 |
|
Lin
|
c836889944
|
Merge pull request #10370 from Hatterhat/blood-drunk-cripple-bad
blood drunk buff probably shouldnt cripple you
|
2020-01-01 21:21:39 +00:00 |
|
kevinz000
|
094d225874
|
Merge remote-tracking branch 'citadel/master' into michael_labs
|
2019-12-31 19:54:01 -08:00 |
|
kevinz000
|
ec67a38093
|
Merge pull request #10330 from keronshb/keronnanite
More nanites from /tg/station
|
2019-12-31 19:32:05 -08:00 |
|
Lin
|
b651bbcdb3
|
Merge branch 'master' into Ghommie-cit367
|
2019-12-31 22:37:59 +00:00 |
|
kevinz000
|
f920e7b73c
|
changes
|
2019-12-31 10:08:14 -08:00 |
|
Hatterhat
|
76e789d3d1
|
getting limb crippled is a 4head bruh
|
2019-12-31 00:14:52 -06:00 |
|
Putnam
|
71fcd23f1f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole
|
2019-12-30 13:31:15 -08:00 |
|
Ghommie
|
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 |
|
Seris02
|
9653dc470b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into autoooc
|
2019-12-30 22:48:39 +08:00 |
|
Ghom
|
6e506c949e
|
Merge pull request #10348 from Putnam3145/radiation
fix divide by 0 runtime in new contam
|
2019-12-30 11:08:52 +01:00 |
|
Ghom
|
a6e72c8cad
|
ok
|
2019-12-30 11:00:21 +01:00 |
|
Putnam
|
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 |
|
Putnam
|
6e9d13e48f
|
Replace the cryopod with a simple ghost button.
|
2019-12-30 01:52:06 -08:00 |
|
Putnam
|
f2759abb4c
|
fixed a runtime
|
2019-12-30 01:18:05 -08:00 |
|
Putnam
|
90ebbdfdb9
|
elements are so good. they're so good
|
2019-12-30 00:53:03 -08:00 |
|
kevinz000
|
d1434c767c
|
Merge pull request #10335 from kappa-sama/patch-12
mouth slice
|
2019-12-30 00:11:38 -08:00 |
|
kevinz000
|
74edd7b13f
|
Merge pull request #10243 from Putnam3145/lewdchem-better-options
Lewd chem sanity pass/"ERP preferences"
|
2019-12-30 00:09:18 -08:00 |
|
Putnam
|
1b7e9c6716
|
wow divide by 0 very cool
|
2019-12-29 22:03:23 -08:00 |
|
Ghommie
|
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 |
|
keronshb
|
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 |
|
Seris02
|
3d3407363c
|
auto ooc
|
2019-12-29 18:48:00 +08:00 |
|
kappa-sama
|
3fad4edae0
|
mouth
|
2019-12-28 23:57:07 -05:00 |
|
Ghommie
|
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 |
|
keronshb
|
390cfd8b64
|
Nanite ports from /tg/
Ports a couple of the newer nanite features from /tg/
|
2019-12-28 16:56:17 -05:00 |
|
Ghom
|
2ad4698225
|
Merge pull request #10217 from Putnam3145/radiation
Nerfing radioactive contamination
|
2019-12-28 17:21:25 +01:00 |
|
Lin
|
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 |
|
Ghom
|
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 |
|
Ghommie
|
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 |
|
Putnam
|
88222c0901
|
uh, actually did that
|
2019-12-24 23:58:22 -08:00 |
|
Seris02
|
a106fde6cc
|
a few fixes here and there and updating it
|
2019-12-24 23:38:27 +08:00 |
|
Seris02
|
85c5a5dfa1
|
Merge branch 'rising_bass' of https://github.com/Seris02/Citadel-Station-13 into rising_bass
|
2019-12-24 22:29:46 +08:00 |
|
Seris02
|
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 |
|
TrilbySpaceClone
|
ec0596c404
|
Update
|
2019-12-23 18:52:33 -05:00 |
|
Ghommie
|
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 |
|
Ghom
|
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 |
|
Ghommie
|
e74339ce8b
|
Jfc that's a lot of work!
|
2019-12-23 04:24:13 +01:00 |
|
TrilbySpaceClone
|
c7dbdd73df
|
Merge branch 'master' into donut
|
2019-12-22 02:36:57 -05:00 |
|
Ghommie
|
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 |
|
Ghom
|
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 |
|
r4d6
|
c5aef98252
|
Make things even more organized
|
2019-12-21 09:17:15 -05:00 |
|