BlackMajor
|
08d042901c
|
thank you github
|
2020-01-02 22:16:47 +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
|
8085022d97
|
Couple of changes. Starting on the point bank.
|
2019-12-31 23:28:30 +13:00 |
|
BlackMajor
|
62b3c1e65b
|
Makes pick up range work
|
2019-12-30 02:28:23 +13: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 |
|
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 |
|
Ghom
|
f68d7fa1a3
|
Merge pull request #10328 from Putnam3145/dynamic-ghost-tweaks
Makes ghost cafe mobs actually a ghost role
|
2019-12-29 00:08:38 +01:00 |
|
Putnam
|
a0374f82e2
|
Made a line use the dang macro
|
2019-12-28 13:55:54 -08:00 |
|
Lin
|
d562a5ba27
|
Merge pull request #10212 from Ghommie/Ghommie-cit471
Ports some hud and update_icon code updates.
|
2019-12-28 04:07:03 +00:00 |
|
Lin
|
80daaacc86
|
Merge pull request #10268 from Ghommie/Ghommie-cit487
Effectively removes the old unused roboticist encryption key and headset.
|
2019-12-28 00:08:24 +00:00 |
|
Lin
|
be57c26acc
|
Merge pull request #10289 from Ghommie/Ghommie-cit493
[s] fixes a little door assembly glass dupe exploit
|
2019-12-28 00:06:25 +00:00 |
|
Ghom
|
13fc20c7c3
|
Merge pull request #10296 from Useroth/ghostcafe
Added a ghost role with its own spawner for the purposes of chillling in the ninja holding facility.
|
2019-12-27 16:30:13 +01:00 |
|
Useroth
|
a3776fb966
|
Small touch-up.
|
2019-12-27 16:05:07 +01:00 |
|
Useroth
|
c3298d525f
|
Good idea, tbh.
|
2019-12-27 15:57:49 +01:00 |
|
Ghom
|
5873ee8ea8
|
Merge pull request #10264 from Seris02/wintercoatsagain
Makes cultist coats hold respective items, can actually make them and adds cosmetic versions to the loadout
|
2019-12-27 13:27:04 +01:00 |
|
BlackMajor
|
4e1a9b83cf
|
Pushing work for tonight.
|
2019-12-28 01:01:26 +13:00 |
|
Seris02
|
8ed4fe9c05
|
changes
|
2019-12-27 18:09:30 +08:00 |
|
Useroth
|
35846c452a
|
Applied suggestions and minor tweaks.
|
2019-12-26 20:03:43 +01:00 |
|
Ghom
|
12d0a2ee4c
|
Merge pull request #10281 from Hatterhat/4-am-coding-more-like-4head
good idea: .357 speedloaders printable with advanced illegal ballistics, bad idea: revolver now gets an extra speedloader and a box
|
2019-12-26 16:07:45 +01:00 |
|
Ghom
|
512d046f18
|
Merge pull request #10128 from Seris02/clownheadset
gives the clown a headset with a clown megaphone loudmode
|
2019-12-26 13:58:45 +01:00 |
|
Useroth
|
cbff758d1a
|
Added a ghost role with its own spawner for the purposes of chillling in the ninja holding facility.
|
2019-12-26 07:49:48 +01:00 |
|
Ghommie
|
6a5a917944
|
[s] fixes a little door assembly glass dupe exploit
|
2019-12-25 07:00:53 +01:00 |
|
Seris02
|
9e6f0762b7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into rising_bass
|
2019-12-24 22:27:41 +08:00 |
|
Hatterhat
|
d1c96237a6
|
the very shitty idea: "muh speedloader"
|
2019-12-24 04:16:33 -06:00 |
|
Ghom
|
9a022f21eb
|
Merge pull request #10245 from r4d6/substationV2
Make Box's Engine be randomised between SM, Tesla and Singulo V2 [TEST-MERGE]
|
2019-12-23 18:58:26 +01:00 |
|
r4d6
|
b909f54ba5
|
Revert "Revert "Add the option to restrict the Engine that spawn""
This reverts commit d851beea16.
|
2019-12-23 10:25:37 -05:00 |
|
r4d6
|
d851beea16
|
Revert "Add the option to restrict the Engine that spawn"
This reverts commit e3e1f91635.
|
2019-12-23 10:23:55 -05:00 |
|
r4d6
|
e3e1f91635
|
Add the option to restrict the Engine that spawn
|
2019-12-23 10:06:35 -05:00 |
|
kevinz000
|
1b9b54b33d
|
Merge pull request #10267 from Ghommie/Ghommie-cit486
Fills white first aid kits to the brim. Ergo how I was fooled into believing it was a tweak and not a nerf.
|
2019-12-23 00:44:42 -08:00 |
|
Ghommie
|
4fbd9fdca0
|
Effectively removes the long unrequired roboticist encryption key.
|
2019-12-22 12:02:15 +01:00 |
|
Ghommie
|
8bc277d38d
|
Fills white first aid kits to the brim. Ergo how I was fooled into believing it was a tweak and not a nerf.
|
2019-12-22 11:40:25 +01:00 |
|
TrilbySpaceClone
|
c7dbdd73df
|
Merge branch 'master' into donut
|
2019-12-22 02:36:57 -05:00 |
|
r4d6
|
383e09651f
|
Suggestions
|
2019-12-21 14:55:37 -05:00 |
|
Ghommie
|
395457f7ef
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471
|
2019-12-21 17:59:32 +01:00 |
|
Ghom
|
9d00072072
|
Merge pull request #10257 from DeltaFire15/communication-magicnumbad
Removes a magicnumber
|
2019-12-21 15:33:27 +01:00 |
|
DeltaFire
|
3738156340
|
Magic number baaad
|
2019-12-21 15:16:28 +01:00 |
|
Ghom
|
ce34bcf2e4
|
Merge pull request #10012 from Commandersand/INEEDAMEDICBAG
Rebalance/port: refactor ported, ointment/brute pack healing nerf but max stack doubled. gauze heals a bit now
|
2019-12-21 14:34:43 +01:00 |
|
Ghom
|
7f0ae5dbde
|
I gotta go fast.
|
2019-12-21 13:04:27 +01:00 |
|
Ghom
|
3df8619980
|
Merge pull request #10141 from Putnam3145/dynamic-statbus
Adds a bunch of statbus logging to dynamic
|
2019-12-21 11:45:44 +01:00 |
|
Ghom
|
71d0c3e257
|
Merge pull request #10232 from DeltaFire15/cc-headmessages
All heads of staff can now spam CC.
|
2019-12-21 11:27:04 +01:00 |
|
Ghom
|
848ad4b39b
|
Merge pull request #9940 from Putnam3145/dynamic-roundstart-overhaul
Dynamic rulesets that have fired in recent rounds have lower weight
|
2019-12-21 11:20:24 +01:00 |
|
Ghom
|
19fc981cc1
|
Merge pull request #9596 from Linzolle/abductor-update
Bring abductors up-to-date with /tg/.
|
2019-12-21 11:15:29 +01:00 |
|
Ghom
|
a7cda1aea0
|
Merge pull request #10059 from lolman360/HeadCorgi
you can pick up corgis now
|
2019-12-21 11:05:36 +01:00 |
|
Ghom
|
9a38612ec4
|
Merge pull request #10235 from Citadel-Station-13/kevinz000-patch-128
flashbangs process flash/bang separately based on blindness/hearing and uses viewers(), which means xray users suffer too if they see them go off
|
2019-12-20 16:27:47 +01:00 |
|
DeltaFire
|
685425ed55
|
Atomises out the magicnumber change
|
2019-12-20 15:26:16 +01:00 |
|