 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
|
34f76aa042
|
Merge remote-tracking branch 'upstream/master'
|
2020-01-02 22:13:01 +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 |
|
|
BlackMajor
|
62c8fce043
|
Fix conflict
|
2020-01-02 21:56:17 +13:00 |
|
|
CitadelStationBot
|
ab15fdcabf
|
Automatic changelog generation for PR #10371 [ci skip]
|
2020-01-02 00:08:23 -06: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 |
|
|
CitadelStationBot
|
49084e8394
|
Automatic changelog generation for PR #10366 [ci skip]
|
2020-01-02 00:07:42 -06: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 |
|
|
CitadelStationBot
|
96a57d74db
|
Automatic changelog generation for PR #10374 [ci skip]
|
2020-01-02 00:07:20 -06: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 |
|
|
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
|
1195762f86
|
space cola isnt a reagent idiot
|
2020-01-01 20:37:09 -06:00 |
|
|
CitadelStationBot
|
0ad15d4cb5
|
Automatic changelog generation for PR #10368 [ci skip]
|
2020-01-01 20:32:51 -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 |
|
|
CitadelStationBot
|
459275fd2e
|
Automatic changelog generation for PR #10379 [ci skip]
|
2020-01-01 20:32:19 -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 |
|
|
CitadelStationBot
|
0f8234b20d
|
Automatic changelog generation for PR #10369 [ci skip]
|
2020-01-01 20:28:38 -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 |
|
|
CitadelStationBot
|
6abcb5ad50
|
Automatic changelog generation for PR #10372 [ci skip]
|
2020-01-01 20:28:18 -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 |
|
|
CitadelStationBot
|
58241b704e
|
Automatic changelog generation for PR #10370 [ci skip]
|
2020-01-01 15:21:42 -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 |
|
|
Hatterhat
|
200de62b8e
|
tweaks transfer amounts, uncucks hypovials
|
2020-01-01 08:50:15 -06:00 |
|
|
CitadelStationBot
|
f425c42e72
|
Automatic changelog generation for PR #10383 [ci skip]
|
2020-01-01 07:36:12 -06:00 |
|
|
Ghom
|
66a7821696
|
Merge pull request #10383 from Citadel-Station-13/kevinz000-patch-4
megafauna (including player transformed ones !!) are no longer deaf
|
2020-01-01 14:36:10 +01: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 |
|
|
Hatterhat
|
318a6812c3
|
manually copied tgstation#47443
|
2019-12-31 21:38:11 -06:00 |
|
|
CitadelStationBot
|
12c099c23e
|
Automatic changelog generation for PR #10330 [ci skip]
|
2019-12-31 21:32:07 -06:00 |
|
|
kevinz000
|
ec67a38093
|
Merge pull request #10330 from keronshb/keronnanite
More nanites from /tg/station
|
2019-12-31 19:32:05 -08:00 |
|
|
CitadelStationBot
|
b592af1745
|
Automatic changelog generation for PR #10356 [ci skip]
|
2019-12-31 21:29:50 -06: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 |
|
|
CitadelStationBot
|
0d42d9356b
|
Automatic changelog generation for PR #10361 [ci skip]
|
2019-12-31 21:28:58 -06:00 |
|
|
kevinz000
|
1051d99fdf
|
Merge pull request #10361 from CameronWoof/fashion-ghosts
Ghost Cafe patrons now spawn with chameleon kits
|
2019-12-31 19:28:55 -08:00 |
|
|
CameronWoof
|
58e50de434
|
grampa ghommles doesn't like kids and their newfangled technology and also the VA denied his claim and now he hates bureaucracy
|
2019-12-31 17:44:18 -08:00 |
|
|
CitadelStationBot
|
811f1f3768
|
Automatic changelog generation for PR #9856 [ci skip]
|
2019-12-31 16:54:56 -06:00 |
|
|
Lin
|
2796719399
|
Merge pull request #9856 from Ghommie/Ghommie-cit367
Refactoring code to allow all living mobs to use shields.
|
2019-12-31 22:54:53 +00:00 |
|
|
Lin
|
b651bbcdb3
|
Merge branch 'master' into Ghommie-cit367
|
2019-12-31 22:37:59 +00:00 |
|
|
CitadelStationBot
|
a3ee3fe826
|
Automatic changelog generation for PR #10349 [ci skip]
|
2019-12-31 11:01:26 -06:00 |
|
|
Ghom
|
cba4bc27ef
|
Merge pull request #10349 from KathrinBailey/CE-locker
CE Locker Vengeance: The Removaling + Welding locker consistency changes + Empty lockers for mappers
|
2019-12-31 18:01:23 +01:00 |
|
|
KathrinBailey
|
243aebe12a
|
dab 2x
|
2019-12-31 16:54:59 +00:00 |
|
|
KathrinBailey
|
0a19f62fa9
|
dab
|
2019-12-31 16:45:06 +00:00 |
|
|
KathrinBailey
|
f2e9ba2a8e
|
Makes lockers into subtypes
Adds new lockers cleanly at the bottom instead and as subtypes.
|
2019-12-31 16:41:23 +00:00 |
|