Commit Graph
55 Commits
Author SHA1 Message Date
Ghommie ee73806616 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit352 2019-11-21 09:18:14 +01:00
kevinz000andGitHub 4ad56ac1e2 Merge pull request #9614 from Trilbyspaceclone/patch-234
Lowers ghosts and insain clowns hp to 120 from 1e6
2019-11-14 16:07:43 -07:00
Ghommie b48ddb99fc Uplink items are now automatically sorted alphabetically. Fixed categories. 2019-11-14 02:56:26 +01:00
Ghommie e977ba6729 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-10 23:17:58 +01:00
Ghommie 29daa0c908 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-04 22:59:24 +01:00
TrilbyspacecloneandGitHub fe87eec45c i hate mob code 2019-11-04 00:58:51 -05:00
Ghommie 431ab8fc0b better be safe than sorry. 2019-11-03 17:56:30 +01:00
Ghommie 3cf056ed93 Also fixing jacqueen... wrong tools.dmi 2019-11-03 15:26:16 +01:00
Ghommie 2653a2965d How about we only check the living? 2019-11-02 20:46:33 +01:00
Ghommie f4587b4260 This is very unprofessional. Yet I'm no google architect. 2019-11-02 16:47:25 +01:00
Ghommie 50fc1004ba Actually holopads, so they won't end up in maintenance... 2019-11-02 16:46:02 +01:00
Ghommie 3193e3ce20 fix. 2019-11-02 16:12:37 +01:00
Ghommie a949f84557 missing bits. 2019-11-02 16:00:48 +01:00
Ghommie 1bf10c0435 Improving Jacqueen's teleportation area selection. 2019-11-02 15:50:54 +01:00
TrilbyspacecloneandGitHub bbd3c55fbc Update halloween.dm 2019-10-29 21:37:44 -04:00
Ghommie a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
FermiandFermi be470c2d18 Oranges are high 2019-10-29 08:07:11 +00:00
FermiandFermi 5356afa9e6 Barthhhh 2019-10-29 06:14:31 +00:00
Thalpy e71dc54594 i-- 2019-10-29 03:29:56 +00:00
Thalpy a1e611e7aa Heck 2019-10-29 03:23:46 +00:00
Thalpy 39f7116353 Oops 2019-10-29 03:22:21 +00:00
Thalpy 0fabd72087 Barth you fusspot 2019-10-27 22:40:45 +00:00
Thalpy 6de94a23c0 Oops 2019-10-27 22:32:47 +00:00
Thalpy c30f550274 Well here it is 2019-10-27 22:29:35 +00:00
Thalpy a76ff4efe6 Alright 2019-10-27 19:24:23 +00:00
Thalpy 739de1b378 Fixes 2019-10-27 19:07:06 +00:00
TrilbyspacecloneandGitHub d9babbd97b fuck god mode 2019-10-26 09:16:29 -04:00
TrilbyspacecloneandGitHub f983db61bf Update halloween.dm 2019-10-25 18:08:33 -04:00
kappa-samaandGitHub cbf02e76a4 fixes cringe
why is this broken and who added this
2019-10-16 19:47:14 -04:00
Thalpy e7c5e74d3a Hopefully no break 2019-10-13 23:41:06 +01:00
Thalpy ac2aba50a6 Turns Jacq into her own event 2019-10-13 22:33:46 +01:00
Thalpy 356a1279f1 Adds vars for the ball. 2019-10-13 20:06:40 +01:00
FermiandFermi ecfc988911 Okay! 2019-10-12 09:15:32 +01:00
FermiandFermi 6e7c433536 Song fix 2019-10-11 21:34:30 +01:00
FermiandFermi dbcda948fb Darn thing 2019-10-11 19:56:58 +01:00
FermiandFermi bfd97a82ca Eh 4 mins. 2019-10-11 18:56:33 +01:00
FermiandFermi 8f6c988536 Explod 2019-10-11 18:17:43 +01:00
FermiandFermi 8e71a20528 Oops 2019-10-11 18:16:25 +01:00
FermiandFermi ae46b2932e Bath is ready to go. 2019-10-11 18:15:46 +01:00
FermiandFermi 3009f8b2cc Meow 2019-10-11 17:56:24 +01:00
FermiandFermi d21f7f9a9b Jacq fix 2019-10-11 15:26:39 +01:00
FermiandFermi 349b5f4369 GRUMBLING INTENSIFIES 2019-10-11 14:36:35 +01:00
FermiandFermi 3ae8581d96 HOPE 2019-10-11 14:34:40 +01:00
Thalpy 41946dd9cf Updates icons 2019-10-10 09:27:15 +01:00
Thalpy 348f6a4db4 Fixes Icons 2019-10-10 07:36:44 +01:00
Thalpy eaa84418c9 Fixes compile errors 2019-10-10 07:17:22 +01:00
FermiandFermi 8f9622cbe2 Well lets try it 2019-10-09 18:01:09 +01:00
FermiandFermi 53e8d64388 Ah I see now 2019-10-09 17:51:14 +01:00
FermiandFermi 35fe28ce43 oof 2019-10-09 16:40:55 +01:00
FermiandFermi 8a7f27803c Maybe 2019-10-09 16:40:01 +01:00