MrJWhit
|
44b96f01ea
|
Make radiation collectors move faster
Words
|
2020-01-03 06:04:10 -05: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 |
|
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 |
|
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 |
|
kevinz000
|
67d9923ff7
|
Merge pull request #10371 from kappa-sama/patch-15
call of duty loot boxes
|
2020-01-01 22:08:20 -08:00 |
|
kevinz000
|
16172f68aa
|
Merge pull request #10366 from Hatterhat/beaker-buff
beaker buff - alt title fuck hypovials and fuck making them free and better alternatives to beakers
|
2020-01-01 22:07:40 -08:00 |
|
nik707
|
a881231149
|
Merge pull request #10395 from Hatterhat/shit-and-cum
space cola isnt a reagent idiot, codeside change only
|
2020-01-01 20:45:33 -06:00 |
|
Hatterhat
|
5b99524e82
|
Revert "Makes the efficiency of the TEG be dependant on how much gas is actively combusting in the hot pipe"
|
2020-01-01 20:44:48 -06:00 |
|
Hatterhat
|
1195762f86
|
space cola isnt a reagent idiot
|
2020-01-01 20:37:09 -06:00 |
|
nik707
|
1e6a485976
|
Merge pull request #10368 from Hatterhat/orm-laser-fix-question-mark
ORM lasers actually affect point return
|
2020-01-01 20:32:48 -06:00 |
|
nik707
|
75d5e324ec
|
Merge pull request #10379 from Hatterhat/tg-47443-shotgunpbs
shotgun pointblanking people actually throws them
|
2020-01-01 20:32:16 -06:00 |
|
nik707
|
e232b13119
|
Merge pull request #10369 from Hatterhat/patch-4
crusher trophy drop chance increase
|
2020-01-01 20:28:35 -06:00 |
|
deathride58
|
8390334d1e
|
mirrors tgstation 48524
|
2020-01-01 18:59:05 -05:00 |
|
CameronWoof
|
9a54467064
|
Robots can now view the crew manifest
|
2020-01-01 14:38:46 -08:00 |
|
Ghommie
|
37ce6e9336
|
honk
|
2020-01-01 20:47:36 +01:00 |
|
Hatterhat
|
200de62b8e
|
tweaks transfer amounts, uncucks hypovials
|
2020-01-01 08:50:15 -06:00 |
|
kevinz000
|
68bc6dcc2a
|
Update megafauna.dm
|
2020-01-01 02:43:43 -08:00 |
|
Hatterhat
|
0374870c41
|
bulldogs knockback too
|
2020-01-01 02:04:03 -06:00 |
|
kevinz000
|
094d225874
|
Merge remote-tracking branch 'citadel/master' into michael_labs
|
2019-12-31 19:54:01 -08:00 |
|
Hatterhat
|
318a6812c3
|
manually copied tgstation#47443
|
2019-12-31 21:38:11 -06:00 |
|
kevinz000
|
ec67a38093
|
Merge pull request #10330 from keronshb/keronnanite
More nanites from /tg/station
|
2019-12-31 19:32:05 -08:00 |
|
kevinz000
|
c222ea0bb3
|
Merge pull request #10356 from deathride58/sprintprefs
Adds space to sprint and toggle sprint as preferences
|
2019-12-31 19:29:47 -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 |
|
Ghommie
|
99c3358d61
|
Fixing a whacky female clothing caching related issue.
|
2019-12-31 17:13:01 +01:00 |
|
Ghom
|
93e090d229
|
Merge pull request #10309 from Seris02/disablerglasses
disabler sechuds, let the adminbus commence
|
2019-12-31 14:43:39 +01:00 |
|
Ghom
|
4660465115
|
Merge pull request #10362 from Trilbyspaceclone/patch-258
Corrects bottle/pill/patch/condiments "#$39;"
|
2019-12-31 14:39:34 +01:00 |
|
Ghom
|
78e4c608ad
|
Merge pull request #10319 from Seris02/coconutsyep
porting azarak's coconuts from hyper station
|
2019-12-31 13:16:07 +01:00 |
|
BlackMajor
|
8085022d97
|
Couple of changes. Starting on the point bank.
|
2019-12-31 23:28:30 +13:00 |
|
kappa-sama
|
c0bc53ea81
|
more
|
2019-12-31 01:43:42 -05:00 |
|
kappa-sama
|
970814adbc
|
it begins
|
2019-12-31 01:42:07 -05:00 |
|
Hatterhat
|
4c5f6f895b
|
tgstation 42481
|
2019-12-31 00:07:36 -06:00 |
|
Hatterhat
|
ff8a86d05a
|
squashing is hell but orm lasers work
|
2019-12-30 23:50:49 -06:00 |
|