 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 |
|
|
chefferz
|
46feaf9663
|
Update watercloset.dm
|
2020-01-02 01:09:29 -05: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 |
|
|
kevinz000
|
e771ea9066
|
Merge pull request #10374 from Trilbyspaceclone/patch-260
[s] Fixes Dragon's Tooth Sword 50% armor penetration by making it 35%
|
2020-01-01 22:07:18 -08:00 |
|
|
kevinz000
|
b5b00102a0
|
Update shuttle.dm
|
2020-01-01 22:04:34 -08:00 |
|
|
Linzolle
|
74c308c16c
|
runtime fix
|
2020-01-01 22:23:16 -06:00 |
|
|
Putnam
|
21fc6d1d2b
|
saving is back
|
2020-01-01 19:24:13 -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 |
|
|
nik707
|
be9912227f
|
Merge pull request #10372 from Hatterhat/the-one-with-the-forcefields
forcefield projectors on toolbelts, cool and good sprites for atmos holofan/forcefield proj
|
2020-01-01 20:28:15 -06:00 |
|
|
chefferz
|
6222b41204
|
Update forcefieldprojector.dm
|
2020-01-01 20:44:16 -05:00 |
|
|
deathride58
|
8390334d1e
|
mirrors tgstation 48524
|
2020-01-01 18:59:05 -05:00 |
|
|
Putnam
|
00bc8dbc97
|
actually no
|
2020-01-01 15:06:37 -08:00 |
|
|
CameronWoof
|
9a54467064
|
Robots can now view the crew manifest
|
2020-01-01 14:38:46 -08:00 |
|
|
Putnam
|
b69950ac2b
|
wow good thing this was impossible to check
|
2020-01-01 13:47:51 -08:00 |
|
|
Putnam
|
1acb499929
|
moved a thing to prevent a runtime
|
2020-01-01 13:26:43 -08: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 |
|
|
Putnam
|
d0b1c442a0
|
tweaks
|
2020-01-01 13:15:13 -08:00 |
|
|
Putnam
|
607109e0d2
|
also added individual ballot gathering
|
2020-01-01 12:29:13 -08:00 |
|
|
Ghommie
|
37ce6e9336
|
honk
|
2020-01-01 20:47:36 +01:00 |
|
|
Putnam
|
444f862a4d
|
Renamed the options to make clear this isn't scoring?
|
2020-01-01 11:37:40 -08:00 |
|
|
Hatterhat
|
200de62b8e
|
tweaks transfer amounts, uncucks hypovials
|
2020-01-01 08:50:15 -06: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
|
68bc6dcc2a
|
Update megafauna.dm
|
2020-01-01 02:43:43 -08:00 |
|
|
Putnam
|
96cbc2704f
|
Made random always available.
|
2020-01-01 00:32:49 -08:00 |
|
|
Putnam
|
bf752ab2e6
|
more extreme.
|
2020-01-01 00:30:34 -08:00 |
|
|
Putnam
|
d6fece9a57
|
removed extended weighting on intrigue
|
2020-01-01 00:28:39 -08:00 |
|
|
Putnam
|
6bbdd5d576
|
try recent round removal again
|
2020-01-01 00:26:55 -08:00 |
|
|
Hatterhat
|
0374870c41
|
bulldogs knockback too
|
2020-01-01 02:04:03 -06:00 |
|
|
Putnam
|
42347fd5ea
|
more conveyance on how the voting works
|
2019-12-31 23:19:39 -08:00 |
|
|
Putnam
|
9b0e27cbc3
|
2 minute vote time
|
2019-12-31 23:11:34 -08:00 |
|
|
Putnam
|
51a7c7776a
|
1-5 -> -2 to 2
|
2019-12-31 23:03:58 -08:00 |
|
|
kevinz000
|
094d225874
|
Merge remote-tracking branch 'citadel/master' into michael_labs
|
2019-12-31 19:54:01 -08:00 |
|
|
Hatterhat
|
ef36b9df75
|
i love democracy
|
2019-12-31 21:44:03 -06:00 |
|