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 |
|
nik707
|
e232b13119
|
Merge pull request #10369 from Hatterhat/patch-4
crusher trophy drop chance increase
|
2020-01-01 20:28:35 -06: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 |
|
kevinz000
|
68bc6dcc2a
|
Update megafauna.dm
|
2020-01-01 02:43:43 -08:00 |
|
kevinz000
|
094d225874
|
Merge remote-tracking branch 'citadel/master' into michael_labs
|
2019-12-31 19:54:01 -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 |
|
Hatterhat
|
4c5f6f895b
|
tgstation 42481
|
2019-12-31 00:07:36 -06:00 |
|
nik707
|
70d03a7870
|
Merge pull request #10344 from Ghommie/Ghommie-cit495
chestbursters deleting brains fix.
|
2019-12-30 18:31:34 -06:00 |
|
nik707
|
8a4e44758f
|
Merge pull request #10165 from Ghommie/Ghommie-cit456
Minor underwear fixes and tweaks.
|
2019-12-30 18:28:48 -06:00 |
|
nik707
|
23f79ffed8
|
Merge pull request #10123 from Citadel-Station-13/throwing_disarm_stuff
throwing now only randomly turns things if you are on harm intent
|
2019-12-30 18:28:16 -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
|
80e716eeaf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
|
2019-12-30 18:14:47 +01: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 |
|
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
|
90ebbdfdb9
|
elements are so good. they're so good
|
2019-12-30 00:53:03 -08:00 |
|
kevinz000
|
24e3b88a34
|
Merge remote-tracking branch 'citadel/master' into michael_labs
|
2019-12-30 00:32:25 -08:00 |
|
kevinz000
|
ae77577ed3
|
Merge pull request #10239 from Ghommie/Ghommie-cit480
Fixing a few consistency issues with Nightmares.
|
2019-12-30 00:15:03 -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 |
|
kevinz000
|
47c92e380c
|
Merge branch 'master' into throwing_disarm_stuff
|
2019-12-30 00:05:17 -08:00 |
|
kevinz000
|
310d343242
|
Merge pull request #10095 from Ghommie/Ghommie-cit443
Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks.
|
2019-12-30 00:03:21 -08:00 |
|
Putnam3145
|
640419eed5
|
Merge pull request #10343 from Ghommie/Ghommie-cit494
[s] Fixes anti-ghost-role vars a little.
|
2019-12-29 20:54:55 -08:00 |
|
deathride58
|
1b6359a175
|
[experimental] Buffs the stamina buffer by making it recharge for free.
|
2019-12-29 20:18:52 -05:00 |
|
Ghommie
|
87cca7a649
|
...which var are you?
|
2019-12-30 01:05:54 +01:00 |
|
Ghommie
|
8a32b89f17
|
Wait a minute...
|
2019-12-30 01:05:21 +01:00 |
|
Ghommie
|
55cb844bc2
|
chestbursters deleting brains fix.
|
2019-12-30 01:00:36 +01: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 |
|
Ghommie
|
0ab817c208
|
[s] Fixes ghost anti-ghostrole timers a little.
|
2019-12-29 22:22:20 +01:00 |
|
Ghom
|
d1a4bf6895
|
Merge pull request #10323 from Seris02/pandorafix
probably fixes pandoras attacking their owners
|
2019-12-29 17:30:59 +01:00 |
|
BlackMajor
|
8948e0491e
|
add mining card
|
2019-12-30 02:07:49 +13:00 |
|
BlackMajor
|
b811d3e57e
|
More work on it
|
2019-12-30 01:23:41 +13:00 |
|
Seris02
|
3d3407363c
|
auto ooc
|
2019-12-29 18:48:00 +08:00 |
|
BlackMajor
|
375e59a77d
|
Merge branch 'master' into Yeehaw
|
2019-12-29 22:12:40 +13:00 |
|
BlackMajor
|
2e03a529bf
|
checking off the list
|
2019-12-29 22:11:10 +13:00 |
|
BlackMajor
|
206a5e168a
|
More mining changes
|
2019-12-29 20:15:49 +13:00 |
|
Putnam
|
ed0c91b556
|
Makes ass slap attempts fail more loudly on opted-out mobs
|
2019-12-28 16:23:02 -08: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 |
|
Ghommie
|
37441437d1
|
a
|
2019-12-28 23:02:28 +01:00 |
|
Ghom
|
4fb549631f
|
Don't use named arguments on new, please.
|
2019-12-28 19:12:10 +01:00 |
|
Seris02
|
897766e781
|
maybe fixes?
|
2019-12-29 00:55:13 +08:00 |
|