shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,805 Commits 5 Branches 0 Tags
b0940456f5fd7629f8d15a15d94de4a38b3dccb5
Commit Graph

1472 Commits

Author SHA1 Message Date
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
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
nik707
8a4e44758f Merge pull request #10165 from Ghommie/Ghommie-cit456 
Minor underwear fixes and tweaks.
 2019-12-30 18:28:48 -06:00
CameronWoof
d8c9dd967b Dolly Dress-Up: Ghost Hunter Edition 2019-12-30 14:31:47 -08:00
Putnam
5af513593c fixed conflict, included helpful flavor 2019-12-30 13:34:53 -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
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
6e9d13e48f Replace the cryopod with a simple ghost button. 2019-12-30 01:52:06 -08:00
KathrinBailey
283ccceb24 CE Locker Exodus: The Removaling 
Removes junk from the CE locker.
Adds empty engineering lockers.
I don't know how to do this as a child and not have populate contents fill the child.
 2019-12-30 09:25:03 +00:00
Putnam
90ebbdfdb9 elements are so good. they're so good 2019-12-30 00:53:03 -08:00
Seris02
f1292c503c makes it a trait 2019-12-30 11:33:15 +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
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
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
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
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
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
8c5e506a17 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit382 2019-12-21 18:22:58 +01: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
Ghommie
9db79ff958 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-20 23:40:21 +01:00
Seris02
61ab3685f1 atmos firelock, changes to temp blocking 2019-12-20 14:14:01 +08:00
Ghommie
ba851d55b6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit456 2019-12-18 19:42:41 +01:00
Seris02
6df739a045 changes holofan, adds holofirelock 2019-12-19 00:39:29 +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
Ghommie
5bf252a58c Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls." 2019-12-17 01:57:56 +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
Ghommie
93fbc17428 ports "Standardize obj/updateicon() and update_icons() to update_icon()" 2019-12-16 17:58:50 +01:00
Putnam3145
c39a5d0462 Merge pull request #10011 from Arturlang/Bloodsuckers 
Bloodsuckers, or, yknow, vampires.
 2019-12-15 14:41:36 -08:00
Artur
9faf3d1dac Mooaar fixeees 2019-12-14 01:01:38 +02:00
Ghommie
c098d497ad Minor underwear fixes and tweaks. 2019-12-13 06:50:14 +01:00
Ghommie
3fcb7808fd args 2019-12-13 02:30:17 +01:00
Seris02
f565c1cd3c adds some distance checks 2019-12-12 18:48:25 +08:00