Commit Graph

55 Commits

Author SHA1 Message Date
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
coiax dc6b4e2b61 Christmas event changes (#33861)
* A christmas tree with presents is now a subtype

Admins can now spawn `/obj/structure/flora/tree/pine/xmas/presents`
directly, instead of spawning regular christmas trees and then
triggering the event.

Also, the event now just deletes and replaces the xmas tree with a
present tree; saves on duplication of icon states and vars and all that.

* Code review I

* Gaia's Landing: The PR
2017-12-29 00:28:02 -06:00
Jordan Brown 4499ff2fad Merge pull request #33834 from Xhuis/drone_hats
Drones now spawn with seasonal hats depending on active holidays [VERY Important PR]
2017-12-26 18:38:42 -06:00
CitadelStationBot 938f409782 [MIRROR] Christmas (#4491)
* Christmas (#33690)

* Christmas Event Updates

* Dont recreate the list every time

* Check for drop del

* Changes some things to placate that one guy from FTL

* Christmas
2017-12-22 13:14:25 -08:00
vuonojenmustaturska fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
AnturK f6e07cf824 Makes false alarm use more explicit in event code. 2017-11-11 14:36:36 -06:00
tortellinitony 3772d722e2 Some improvements on the holiday system (#32329) 2017-11-03 23:37:16 -05:00
KorPhaeron 00163837de Halloween Tweaks 2017-10-26 05:20:53 -05:00
CitadelStationBot d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165)
* Grammar fixes to atom descriptions

* compile errors
2017-10-21 07:17:03 -05:00
Jordan Brown bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00
CitadelStationBot 8ef3861b0b [MIRROR] New squeaky datum and plushes (#2847)
* New squeaky datum and plushes

* Update bananashoes.dm
2017-09-22 19:43:56 -05:00
oranges 41277ff110 Removes old debug text 2017-09-21 06:30:11 -05:00
CitadelStationBot e4db027692 [MIRROR] Fixes to more Initialize procs (#2733)
* Fixes to more Initialize procs

* Update ai_monitored.dm

* Update cleanable.dm

* Update instruments.dm

* Update musician.dm

* Update noticeboard.dm

* Update mimic.dm

* Update interactive.dm
2017-09-13 22:54:12 -05:00
LetterJay 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot ef715b7837 Removes all checks for subsystem existence (#2252) 2017-08-04 08:41:52 -07:00
CitadelStationBot a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBot 1da785ffb5 Removes old height parameter from CanPass proc 2017-07-13 17:46:36 -05:00
CitadelStationBot ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
Poojawa b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot a905c15dad Replaces /image with /mutable_appearance (#556)
* Replaces /image with /mutable_appearance, where appropriate

* Update miscellaneous.dm

* Delete miscellaneous.dm.rej

* Delete pet.dm.rej

* Update pet.dm

* Update species.dm

* Update miscellaneous.dm

* Update species.dm

* Update miscellaneous.dm

* Delete species.dm.rej

* Update species.dm

pretty sure I got all the indentation correct THIS time, ffs

* Update species.dm

* Update species.dm

fucking tabs man, fucking tabs.
2017-04-26 08:18:35 -05:00
CitadelStationBot 4baa357739 Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker 2017-04-24 18:07:12 -05:00
Poojawa 7e9b96a00f April sync (#360)
* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
2017-04-13 23:37:00 -05:00
Poojawa f67e9f6d87 Bleeding edgy refresh (#303)
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
2017-03-21 11:44:10 -05:00