 Ghom
|
e85c710962
|
Merge pull request #10399 from Citadel-Station-13/kevinz000-patch-4
Knocks down cargo passive gen 750 -> 500
|
2020-01-04 21:48:48 +01:00 |
|
|
Ghommie
|
356304f68f
|
Fixes roundstart mushpeople not having MUSH PUUUUUUUUUUUUNCH!!
|
2020-01-04 20:34:31 +01:00 |
|
|
Ghom
|
a75b8a387e
|
ok
|
2020-01-04 18:30:37 +01:00 |
|
|
Ghom
|
07a5f052d3
|
Merge pull request #10400 from chefferz/chefferz-toiletshuttle
Gives ability to buckle yourself to a toilet
|
2020-01-04 14:25:54 +01:00 |
|
|
Ghom
|
3086b5eb38
|
boolean
|
2020-01-04 14:19:15 +01:00 |
|
|
Hatterhat
|
92f6fe129a
|
tgstation 40394 port
|
2020-01-04 07:14:39 -06: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 |
|
|
Ghom
|
39da7cc58e
|
Merge pull request #10419 from Citadel-Station-13/kevinz000-patch-6
HELP I CANT POWERGAME NANITES IF I CANT MAKE NANITE MACHINES (please testmerge these things more)
|
2020-01-04 14:03:01 +01:00 |
|
|
kevinz000
|
a930464f57
|
Update extra_drone_types.dm
|
2020-01-04 00:54:06 -08:00 |
|
|
Hatterhat
|
97242050ec
|
bad idea
|
2020-01-04 02:16:55 -06:00 |
|
|
Hatterhat
|
5142a0e4ae
|
that should probably be there
|
2020-01-04 02:07:19 -06:00 |
|
|
Hatterhat
|
7c98656939
|
upstream merge
|
2020-01-04 01:48:50 -06:00 |
|
|
kevinz000
|
0567dcd6df
|
Update godhand.dm
|
2020-01-03 23:34:37 -08:00 |
|
|
kevinz000
|
a4fa24ac15
|
Update touch_attacks.dm
|
2020-01-03 23:33:39 -08:00 |
|
|
Hatterhat
|
186194418e
|
tg 43454+43688 port, tweaks w/ trilby, db crate
|
2020-01-04 01:33:32 -06:00 |
|
|
Trilbyspaceclone
|
94fb114611
|
Update hardsuit.dm
|
2020-01-04 02:11:23 -05:00 |
|
|
Putnam
|
b1b1d7171e
|
hard crit actually
|
2020-01-03 23:07:34 -08:00 |
|
|
Putnam
|
e54ec9ec09
|
shh
|
2020-01-03 23:03:45 -08:00 |
|
|
Hatterhat
|
e65583c403
|
set_AFTFT verb, tweaking shit
|
2020-01-04 00:44:01 -06:00 |
|
|
Linzolle
|
d0263fc669
|
don't act on non mobs
|
2020-01-03 18:21:08 -06:00 |
|
|
kevinz000
|
d1d9b7a179
|
Merge pull request #10403 from r4d6/patch-1
Add a way to make opaque plastic flaps
|
2020-01-03 08:16:17 -08:00 |
|
|
MrJWhit
|
44b96f01ea
|
Make radiation collectors move faster
Words
|
2020-01-03 06:04:10 -05:00 |
|
|
kevinz000
|
04649efc62
|
Update stack.dm
|
2020-01-03 02:46:57 -08:00 |
|
|
BlackMajor
|
a4d2ea0281
|
Small fix
|
2020-01-03 22:39:58 +13: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 |
|
|
nik707
|
8054b08dc3
|
reduces light power of soapstone engravings
|
2020-01-02 23:11:40 -06:00 |
|
|
nik707
|
0f9c3350cd
|
Merge pull request #10189 from Putnam3145/storytellers
n word
|
2020-01-02 22:01:19 -06:00 |
|
|
Lin
|
f7b91f9b65
|
Merge pull request #10238 from Ghommie/Ghommie-cit478
Brings in some mapping code updates.
|
2020-01-03 00:01:54 +00:00 |
|
|
Lin
|
b1ccd512db
|
Merge pull request #10215 from Ghommie/Ghommie-cit473
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
|
2020-01-03 00:00:51 +00:00 |
|
|
Lin
|
4b7e6ec2a5
|
Merge pull request #10270 from Ghommie/Ghommie-cit489
randomized recipes fallback fix.
|
2020-01-02 23:56:43 +00:00 |
|
|
Lin
|
5d667a3540
|
Merge pull request #10388 from CameronWoof/ez-valids
Adds the "View Crew Manifest" verb to Robots
|
2020-01-02 23:54:14 +00:00 |
|
|
kevinz000
|
b580d1dc32
|
Merge pull request #10390 from deathride58/orangespleasestopforcepushing
[s] removes fun
|
2020-01-02 08:56:49 -08:00 |
|
|
Seris02
|
a6a110bca3
|
nopenopenope
|
2020-01-02 19:29:11 +08:00 |
|
|
BlackMajor
|
dd68be6d31
|
IM NOT TRYING TO EDIT CARBON.DM GITHUB, PLEASE.
|
2020-01-02 22:20:54 +13:00 |
|
|
BlackMajor
|
8e5b7c1cba
|
Get outta here
|
2020-01-02 22:17:56 +13:00 |
|
|
BlackMajor
|
08d042901c
|
thank you github
|
2020-01-02 22:16:47 +13:00 |
|
|
BlackMajor
|
da3ab71222
|
Revert "Revert "Revert "Revert "Merge branch 'master' into Yeehaw""""
This reverts commit 74a646490f.
|
2020-01-02 22:16:09 +13:00 |
|
|
BlackMajor
|
74a646490f
|
Revert "Revert "Revert "Merge branch 'master' into Yeehaw"""
This reverts commit 189e1af175.
|
2020-01-02 22:15:40 +13:00 |
|
|
BlackMajor
|
189e1af175
|
Revert "Revert "Merge branch 'master' into Yeehaw""
This reverts commit 1b25996e55.
|
2020-01-02 22:15:36 +13:00 |
|
|
BlackMajor
|
1b25996e55
|
Revert "Merge branch 'master' into Yeehaw"
This reverts commit 490fb3ab61, reversing
changes made to aabb39a364.
|
2020-01-02 22:15:31 +13:00 |
|
|
BlackMajor
|
490fb3ab61
|
Merge branch 'master' into Yeehaw
|
2020-01-02 22:13:52 +13:00 |
|
|
BlackMajor
|
aabb39a364
|
Revert "Merge branch 'master' into Yeehaw"
This reverts commit 30e3edaac1, reversing
changes made to 62c8fce043.
|
2020-01-02 22:06:31 +13:00 |
|
|
BlackMajor
|
30e3edaac1
|
Merge branch 'master' into Yeehaw
|
2020-01-02 22:03:58 +13:00 |
|
|
BlackMajor
|
3239acf74d
|
Sync
|
2020-01-02 22:02:55 +13:00 |
|
|
r4d6
|
6e5d04ff1f
|
Adding a way to make opaque plastic flaps
|
2020-01-02 02:52:48 -05:00 |
|
|
Putnam
|
12680566b7
|
fixed voting.
FUCK
|
2020-01-01 23:37:14 -08: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 |
|