 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 |
|
|
CameronWoof
|
d8c9dd967b
|
Dolly Dress-Up: Ghost Hunter Edition
|
2019-12-30 14:31:47 -08:00 |
|
|
Ghom
|
e309497af2
|
Merge pull request #10339 from Seris02/teleivdrip
telescopic IV drips
|
2019-12-30 18:24:50 +01:00 |
|
|
Seris02
|
f0ba93052d
|
yee2.
|
2019-12-30 23:53:10 +08:00 |
|
|
Seris02
|
f1292c503c
|
makes it a trait
|
2019-12-30 11:33:15 +08:00 |
|
|
Seris02
|
b96bcf6eec
|
tiny fix
|
2019-12-29 23:47:30 +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 |
|
|
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 |
|
|
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
|
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
|
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
|
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 |
|
|
r4d6
|
61a702bad5
|
Merge remote-tracking branch 'upstream/master' into substationV2
|
2019-12-19 23:51:14 -05:00 |
|
|
r4d6
|
dbf3e7d246
|
Add the landmarks
|
2019-12-19 15:27:45 -05:00 |
|
|
nik707
|
63dd3487b3
|
Merge pull request #10090 from Hatterhat/the-one-where-a-4-tc-nukies-kit-gets-buffed
the one where the combat medic kit gets buffed
|
2019-12-19 14:11:27 -06:00 |
|
|
kevinz000
|
8aca8b8f25
|
thank you based ghomtainer (when) 2x how did i not notice this
|
2019-12-19 04:00:37 -07:00 |
|
|
kevinz000
|
9436d218b4
|
thank you based ghomtainer (when)
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-12-19 03:59:57 -07:00 |
|
|
kevinz000
|
eee52655ef
|
Update flashbang.dm
|
2019-12-19 01:57:28 -07:00 |
|
|
Linzolle
|
70e50e57cd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
|
2019-12-17 20:21:49 -06:00 |
|
|
Trilbyspaceclone
|
0f5c8db456
|
Merge branch 'master' into donut
|
2019-12-17 15:12:51 -05:00 |
|
|
Putnam3145
|
7017ab243b
|
Merge pull request #10216 from Ghommie/Ghommie-cit474
Porting a few martial art code updates.
|
2019-12-17 11:47:19 -08:00 |
|
|
Putnam3145
|
0adcb900c1
|
Merge pull request #10155 from Seris02/windowfix
adds some distance checks to some things
|
2019-12-17 11:34:13 -08:00 |
|
|
Putnam3145
|
670141edf7
|
Merge pull request #10209 from Ghommie/Ghommie-cit470
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
|
2019-12-17 11:26:36 -08:00 |
|
|
BlackMajor
|
95c0eddc2a
|
Merge pull request #10072 from Useroth/new-tg-plants
Ported bamboo stuff from tg.
|
2019-12-18 01:02:29 +13:00 |
|
|
Ghommie
|
6b7dcbceb0
|
Porting a few martial art code updates.
|
2019-12-17 03:19:07 +01:00 |
|
|
Ghommie
|
80402a0d88
|
Ports some hud and update_icon code updates.
|
2019-12-16 23:29:20 +01:00 |
|
|
Ghommie
|
447f416ca6
|
Merge branch 'Ghommie-cit470' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit471
|
2019-12-16 19:10:07 +01:00 |
|