Commit Graph
33 Commits
Author SHA1 Message Date
LetterJayandGitHub 51846b1efd Merge pull request #2122 from Citadel-Station-13/upstream-merge-29485
[MIRROR] Map Spellcheck
2017-07-25 12:56:27 -05:00
CitadelStationBot b998e14a5b Map Spellcheck 2017-07-24 21:16:46 -05:00
CitadelStationBot 32586afe69 cerestation grammar fix 2017-07-24 21:16:41 -05:00
CitadelStationBot 755de4f223 Made cell / holding cell windoors their own subtype 2017-07-17 06:52:17 -05:00
CitadelStationBot d286ed197e Cleaned up duped vars 2017-07-15 22:28:58 -05:00
CitadelStationBot 75fe249947 Replaces highpressure windows with plasma windows 2017-07-06 09:11:50 -05:00
PoojawaandGitHub b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJay a4526e8c39 cerestation.dmm 2017-06-26 06:32:22 -05:00
LetterJay 5571cca37c .rej cleanup 2017-06-26 06:14:42 -05:00
LetterJayandGitHub 609ccb554c Delete cerestation.dmm 2017-06-26 03:27:00 -05:00
LetterJayandGitHub 885297aec3 Update cerestation.dmm 2017-06-14 08:18:20 -05:00
CitadelStationBot 96eb21fa2a CereStation Security Department Revamp (and other misc fixes/changes) 2017-05-31 19:57:52 -05:00
LetterJay 168a96c268 back in we go 2017-05-30 23:10:43 -05:00
LetterJayandGitHub 43e0e1e76d Delete cerestation.dmm 2017-05-30 23:06:16 -05:00
LetterJay aedbe151c8 FUUUUUUUUUUUUCK 2017-05-30 23:00:33 -05:00
LetterJay 0401feb327 i hate maps 2017-05-30 22:56:50 -05:00
LetterJay 9b00499d24 It's been a long night 2017-05-30 22:41:22 -05:00
LetterJayandGitHub e9ff797a8b Update cerestation.dmm 2017-05-30 21:56:13 -05:00
CitadelStationBot 415fcf1777 [Cere] QOL fixes 2017-05-24 00:15:39 -05:00
CitadelStationBot abb9676c31 [Cere] Atmospherics Revamp 2017-05-18 16:37:34 -05:00
CitadelStationBotandPoojawa 7a9e05e9d9 Cerestation Tweaks MK VII: BEES edition (#925) 2017-05-18 10:36:51 -05:00
CitadelStationBotandPoojawa eb359f1014 [MIRROR] Cerestation Tweaks VI: Shuttle Edition (#876)
* Cerestation Tweaks VI: Shuttle Edition

* fix .rej
2017-05-18 06:51:26 -05:00
CitadelStationBotandPoojawa cb03dd5d0d [MIRROR] Smartfridges only come preloaded at map start (#837)
* Smartfridges only come preloaded at map start

* update CitadelStation-1.2.1.dmm
2017-05-18 01:12:31 -05:00
CitadelStationBotandPoojawa 257cf986c5 Repaths C4 (#808)
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
2017-05-18 00:37:20 -05:00
CitadelStationBotandkevinz000 3644e9585e Cerestation Tweaks MKV (#683) 2017-05-14 20:25:28 -07:00
CitadelStationBot aa13c4f148 Corrects docking port name for escape pods 2017-05-04 23:16:48 -05:00
LetterJay 8088ce38cc rej file cleanup 2017-04-25 01:15:04 -05:00
CitadelStationBot babb6c53c8 Cerestation Tweaks MKIV 2017-04-24 17:38:22 -05:00
CitadelStationBot 83e69b928b poly's ghost no longer haunts the space of cerestation round-start 2017-04-22 05:42:13 -05:00
CitadelStationBot 24c7594af2 Cerestation Tweaks MKIII 2017-04-17 09:45:49 -05:00
CitadelStationBotandTalkingCactus e12e69b7ba Adds recharger to Cerestation's shuttle and Removes Centcomm's thunderdome doors (#419) 2017-04-16 11:41:32 -04:00
CitadelStationBotandTalkingCactus c38fa1eaa3 Finally kills off my old nemesis of the old fashioned inconsistent shuttle paths (#410) 2017-04-15 15:01:54 -04:00
PoojawaandGitHub 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