 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 |
|
|
TrilbySpaceClone
|
e71d23fc39
|
more fixes
|
2019-12-29 02:51:49 -05:00 |
|
|
BlackMajor
|
206a5e168a
|
More mining changes
|
2019-12-29 20:15:49 +13:00 |
|
|
TrilbySpaceClone
|
8aee20cdf3
|
Ready
|
2019-12-28 17:55:20 -05: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 |
|
|
Seris02
|
1ff7709765
|
all of the weh.
|
2019-12-29 00:12:25 +08:00 |
|
|
Seris02
|
7bde63dcc4
|
weh
|
2019-12-28 23:58:28 +08:00 |
|
|
Seris02
|
cd9966cd7a
|
fixes the thing
|
2019-12-28 17:08:34 +08:00 |
|
|
Seris02
|
69d82338bc
|
excludes certain ghost roles from being affected by health events
|
2019-12-28 16:46:50 +08:00 |
|
|
Seris02
|
4a2b7c2438
|
cocooooonuuuuuuts
|
2019-12-28 16:02:53 +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 |
|
|
Ghommie
|
21cfb2914b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2019-12-27 17:49:59 +01:00 |
|
|
Ghommie
|
b4c0433d6d
|
more work.
|
2019-12-27 17:45:19 +01: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 |
|
|
BlackMajor
|
4e1a9b83cf
|
Pushing work for tonight.
|
2019-12-28 01:01:26 +13: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 |
|
|
Ghommie
|
57cecd2499
|
work
|
2019-12-25 06:54:44 +01:00 |
|
|
Ghommie
|
ffa013af6e
|
Minor captains closet cleanup.
|
2019-12-25 03:59:21 +01:00 |
|
|
Ghommie
|
53d142b4c0
|
more work.
|
2019-12-25 01:34:33 +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 |
|
|
kevinz000
|
976c725de2
|
ok fermis stays
|
2019-12-23 18:32:08 -08:00 |
|
|
kevinz000
|
fb77d07d52
|
plushies woohoo
|
2019-12-23 16:56:43 -08:00 |
|
|
Ghommie
|
d571bbd292
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2019-12-24 00:07:32 +01:00 |
|
|
Ghommie
|
e1949b0131
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
|
2019-12-23 19:02:20 +01: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 |
|
|
Ghommie
|
14c73b7d01
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
|
2019-12-23 14:21:08 +01: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
|
d88f50ac15
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-12-23 05:02:31 +01:00 |
|
|
Ghommie
|
b75349bebf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
|
2019-12-23 04:32:09 +01:00 |
|
|
Ghommie
|
e74339ce8b
|
Jfc that's a lot of work!
|
2019-12-23 04:24:13 +01: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 |
|
|
Trilbyspaceclone
|
0b63e79098
|
Merge branch 'master' into glassware
|
2019-12-21 15:41:45 -05:00 |
|