 Putnam
|
cd35e516ac
|
back by popular demand: maso/nympho
|
2020-01-07 17:01:14 -08:00 |
|
|
keronshb
|
a7af5203e7
|
This is a test to see if they all work together
Title
|
2020-01-06 20:29:44 -05:00 |
|
|
keronshb
|
35cd77d433
|
Adds the nanite remote for some programs
Adds a new remote function from tg
|
2020-01-06 20:28:33 -05:00 |
|
|
Lin
|
46420a693d
|
Merge branch 'master' into Ghommie-cit425
|
2020-01-07 00:28:37 +00:00 |
|
|
Putnam
|
f728c4746f
|
Allowed random engines to be weighted.
|
2020-01-06 16:25:17 -08:00 |
|
|
Ghom
|
d07d436ba2
|
Merge pull request #10384 from Hatterhat/tg-43454-43688-the-one-with-the-cargo
cargo tweaks, new shit, why do digitigrade sprites exist
|
2020-01-06 21:47:15 +01:00 |
|
|
Artur
|
b0cb6aab5c
|
Final commit hopefully
|
2020-01-06 17:26:36 +01:00 |
|
|
Putnam
|
2859e6e5ba
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cold-blooded
|
2020-01-06 02:07:09 -08:00 |
|
|
Putnam
|
72dded26f2
|
cold-blooded trait
|
2020-01-06 02:06:19 -08:00 |
|
|
Putnam3145
|
3b6cf8c952
|
Merge pull request #10401 from r4d6/SM
Add three more Supermatter Engine variation for Box
|
2020-01-05 23:08:49 -08:00 |
|
|
Lin
|
7ad6021472
|
Merge pull request #10437 from Ghommie/Ghommie-cit497
Fixes roundstart mushpeople being unable to MUSH PUUUUUUUUUUUUNCH!!
|
2020-01-06 03:49:52 +00:00 |
|
|
Putnam
|
fba7a8abb0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-05 19:12:28 -08:00 |
|
|
Putnam
|
d75a525b3c
|
let's fix arousal huh
|
2020-01-05 19:10:48 -08:00 |
|
|
Ghom
|
e18244671f
|
Merge pull request #10350 from Putnam3145/dojo-ghostrole
Ghost cafe quality-of-life, plus making ghost role eligibility an element
|
2020-01-05 23:05:13 +01:00 |
|
|
Ghommie
|
592422ee70
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-05 22:53:00 +01:00 |
|
|
Ghommie
|
8c7b648a4f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit425
|
2020-01-05 17:42:54 +01:00 |
|
|
Ghom
|
ca8d93ad17
|
Merge branch 'master' into alcohol-intolerance
|
2020-01-04 23:17:55 +01:00 |
|
|
Ghom
|
7bebd13c54
|
Merge pull request #10412 from Linzolle/matchbox-cars
matchbox runtime fix
|
2020-01-04 22:30:13 +01:00 |
|
|
Ghommie
|
356304f68f
|
Fixes roundstart mushpeople not having MUSH PUUUUUUUUUUUUNCH!!
|
2020-01-04 20:34:31 +01:00 |
|
|
Ghom
|
499907f9b7
|
Merge pull request #10191 from Citadel-Station-13/michael_labs
Custom Holoforms for pAIs and AIs oh and adds certain cyborg pai holograms. also mild pai nerf.
|
2020-01-04 14:07:25 +01:00 |
|
|
Ghommie
|
686a76dd1d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-04 13:35:05 +01:00 |
|
|
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 |
|
|
Seris02
|
46da6604a4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stunglasses
|
2020-01-01 19:28:56 +08: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 |
|