Commit Graph

77 Commits

Author SHA1 Message Date
kappa-sama
cbf02e76a4 fixes cringe
why is this broken and who added this
2019-10-16 19:47:14 -04:00
Fermi
f587beeef4 2 hats and undoes halloween accidental change 2019-10-15 22:56:42 +01: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
Fermi
ecfc988911 Okay! 2019-10-12 09:15:32 +01:00
Fermi
6e7c433536 Song fix 2019-10-11 21:34:30 +01:00
Fermi
dbcda948fb Darn thing 2019-10-11 19:56:58 +01:00
Fermi
bfd97a82ca Eh 4 mins. 2019-10-11 18:56:33 +01:00
Fermi
8f6c988536 Explod 2019-10-11 18:17:43 +01:00
Fermi
8e71a20528 Oops 2019-10-11 18:16:25 +01:00
Fermi
ae46b2932e Bath is ready to go. 2019-10-11 18:15:46 +01:00
Fermi
3009f8b2cc Meow 2019-10-11 17:56:24 +01:00
Fermi
d21f7f9a9b Jacq fix 2019-10-11 15:26:39 +01:00
Fermi
349b5f4369 GRUMBLING INTENSIFIES 2019-10-11 14:36:35 +01:00
Fermi
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
Fermi
8f9622cbe2 Well lets try it 2019-10-09 18:01:09 +01:00
Fermi
53e8d64388 Ah I see now 2019-10-09 17:51:14 +01:00
Fermi
35fe28ce43 oof 2019-10-09 16:40:55 +01:00
Fermi
8a7f27803c Maybe 2019-10-09 16:40:01 +01:00
Fermi
3eea5310c9 Ugh 2019-10-09 16:32:55 +01:00
Fermi
b023671db4 Damnit Jaqc 2019-10-09 16:22:09 +01:00
Fermi
146e0aae29 Crashes make me sad 2019-10-09 15:03:04 +01:00
Fermi
b34f648e60 Adds landmarks. 2019-10-09 13:57:19 +01:00
Fermi
b19c078447 Restructuring. 2019-10-09 12:09:41 +01:00
Fermi
1dce18962d Jaqc complete. 2019-10-09 11:58:36 +01:00
Fermi
9071826e70 I can't focus 2019-10-09 08:34:16 +01:00
Fermi
ea031d6d40 Slowly getting there 2019-10-06 11:09:54 +01:00
Fermi
d023d58b2c Changes 2019-10-06 02:10:46 +01:00
Fermi
63647b58ba Merge branch 'Spookytime' of https://github.com/Thalpy/Citadel-Station-13 into Spookytime 2019-10-06 00:37:01 +01:00
Fermi
aff7f808ec oops 2019-10-06 00:36:57 +01:00
Thalpy
3f21c0af5b Text 2019-10-06 00:32:42 +01:00
Fermi
8686633cc5 Changing branch 2019-10-02 19:35:36 +01:00
Fermi
b099a01a65 Whats life without colour? 2019-10-02 11:06:00 +01:00
Fermi
797dcfc1e3 ahaha 2019-10-02 10:08:45 +01:00
Thalpy
72ccc5fe69 Loopzoop 2019-10-02 06:52:01 +01:00
Fermi
13276d3d96 Tests 2019-10-01 07:35:59 +01:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
Denton
6edd272d76 drone masks for holidays 2018-05-09 13:42:54 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
KorPhaeron
46b7b95897 Finishes overflow roles (#37053) 2018-04-09 05:10:14 -05:00
CitadelStationBot
99487a6bbb [MIRROR] April Fools Day replaces the overflow role with Clowns (#6041)
* April Fools Day replaces the overflow role with Clowns (#36533)

* Refactors overflow job assignment

* Fixes job selection

* April Fools Day replaces the overflow role with Clowns
2018-03-21 12:57:30 -05:00
81Denton
cfd768e09f Changes event earliest_start to use time helpers (#35841)
* uses time helpers, tweaks santa/shuttle loan times

* hourS
2018-02-21 11:38:26 -06:00
CitadelStationBot
71f5bee4c4 [MIRROR] Future proofs Easter calculations (#5247)
* Merge pull request #35079 from tortellinitony/easter

Future proofs Easter calculations

* Future proofs Easter calculations
2018-02-04 22:22:56 -06:00
deathride58
5dc3f29ad4 modules - E to L 2018-01-04 00:53:38 -05:00
LetterJay
518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783
# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm
2017-12-29 01:34:17 -06:00