shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,097 Commits 5 Branches 0 Tags
ace93b6cfdd6d4aae413892fece1952ef8fcf0d1
Commit Graph
102 Commits
Author SHA1 Message Date
LetterJayandGitHub 3d6845675a Merge pull request #679 from Citadel-Station-13/upstream-merge-26709 
[MIRROR] Readds deepstorage w/ tweaks AND adds water bottles to vending machines
 2017-05-01 08:10:13 -05:00
CitadelStationBot 87e306851d Readds deepstorage w/ tweaks AND adds water bottles to vending machines 2017-05-01 07:24:41 -05:00
CitadelStationBot 0ae4f76fb9 Winter Wonderland holodeck no longer has freon, and it's no longer restricted 2017-04-30 15:12:51 -05:00
CitadelStationBotandPoojawa 3d2f91d0c7 Removes a lavaland_surface_ww_vault.dmm because its just bad. (#536) 2017-04-26 11:08:30 -05:00
CitadelStationBot c1fbb61977 Omega Station had two APCs not wired properly. 2017-04-25 23:33:10 -05:00
LetterJay 496107120f the fun never ends 2017-04-25 02:09:21 -05:00
LetterJay 8088ce38cc rej file cleanup 2017-04-25 01:15:04 -05:00
LetterJayandGitHub 88d4703ebf Merge pull request #528 from Citadel-Station-13/upstream-merge-26292 
[MIRROR] [Deltastation] Access Fixes [Ready for Review]*
 2017-04-25 01:14:17 -05:00
LetterJayandGitHub fc0246d388 Merge pull request #538 from Citadel-Station-13/upstream-merge-26444 
[MIRROR] Cerestation Tweaks MKIV
 2017-04-25 01:13:55 -05:00
LetterJayandGitHub a7a08f6cae Merge pull request #548 from Citadel-Station-13/upstream-merge-26496 
[MIRROR] Removes active turfs from Pubby, Box and Crashed Ship ruin
 2017-04-25 01:13:41 -05:00
LetterJayandGitHub 8fcb5d761e Merge pull request #547 from Citadel-Station-13/upstream-merge-26491 
[MIRROR] Fixes turfs on Omegastation
 2017-04-25 01:02:23 -05:00
LetterJayandGitHub d78e5c196d Rename tgstation.2.1.3.dmm.rej to broken.rej 2017-04-25 01:01:11 -05:00
LetterJayandGitHub 4ea582ddef Update tgstation.2.1.3.dmm.rej 2017-04-25 01:00:20 -05:00
LetterJay de1d8188ae removes rej files 2017-04-24 21:34:58 -05:00
CitadelStationBot 7172979792 Removes active turfs from Pubby, Box and Crashed Ship ruin 2017-04-24 20:54:39 -05:00
CitadelStationBot 437634c957 Fixes turfs on Omegastation 2017-04-24 20:54:36 -05:00
CitadelStationBot babb6c53c8 Cerestation Tweaks MKIV 2017-04-24 17:38:22 -05:00
LetterJayandGitHub 7c14af7f7b Merge pull request #511 from Citadel-Station-13/upstream-merge-26365 
[MIRROR] poly's ghost no longer haunts the space of cerestation round-start
 2017-04-24 16:41:55 -05:00
CitadelStationBot 5be9cf5225 [Deltastation] Access Fixes [Ready for Review]* 2017-04-23 14:24:07 -05:00
CitadelStationBotandPoojawa 341951623e Updates space ruins TGM format and noop usage (#504) 2017-04-23 01:31:40 -05:00
CitadelStationBot 83e69b928b poly's ghost no longer haunts the space of cerestation round-start 2017-04-22 05:42:13 -05:00
LetterJayandGitHub b2766df858 Merge pull request #447 from Citadel-Station-13/upstream-merge-26286 
[MIRROR] Expands the bird to Pubbystation
 2017-04-18 01:15:40 -05:00
CitadelStationBot 54012635a7 Expands the bird to Pubbystation 2017-04-17 17:41:57 -05:00
CitadelStationBot 24c7594af2 Cerestation Tweaks MKIII 2017-04-17 09:45:49 -05:00
CitadelStationBotandTalkingCactus dfd470adf9 Adds an xenobiology access shield wall generator to all maps' except Cerestation's xenobiology (#424) 2017-04-16 18:14:19 -04: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 6979200c9b Adds Pill Bottle Closet to Delta (#418) 2017-04-16 11:41:16 -04:00
TalkingCactusandGitHub abd7f2b348 Cleans Up Rejected Mirror files (#414) 
* bang

* updates tgstation.dme

* fixes missing stylesheet entries

* updates the map

includes backup map file

* removes ten billion runtimes
 2017-04-15 17:55:53 -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
Cw 3040andTalkingCactus 07303ebcc6 Maint-Bar Fixes (#366) 
* Map Fix

Why do I even bother living?

* Tweak pt2
 2017-04-15 08:46:33 -04:00
PoojawaandGitHub 9e72b1b8fd /tg/ 4/14 (#367) 
* outside code stuff

* defines, helpers, etc

* everything not module

* modules

* compiled fixes + missing sounds
 2017-04-14 23:28:04 -05: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
Cw 3040 6d8fbd3149 Minor Tweaks 
Tweaked maintbar some more.
 2017-04-01 16:58:19 -04:00
Cw 3040 1eb8ea1f51 Wire Fix 2017-04-01 15:06:09 -04:00
Cw 3040 70d716d4b8 Forgotten Fix 
Cobweb removed
 2017-04-01 14:59:12 -04:00
Cw 3040 cf90cb56ac Requested fixes 
Improved upon the maintenance bar, and included fixes TalkingCactus
outlined.
 2017-04-01 12:16:55 -04:00
Cw 3040 b33d1b1bbc The REAL fix 2017-03-31 11:21:59 -04:00
Cw 3040 99d360f5a2 Revert "Fix 1" 
This reverts commit 528372396c.
 2017-03-31 11:17:27 -04:00
Cw 3040 528372396c Fix 1 2017-03-31 11:14:18 -04:00
Cw 3040 3e01fdacd2 Revert "Change pt2" 
This reverts commit 4494019f0d.
 2017-03-31 11:11:13 -04:00
Cw 3040 4494019f0d Change pt2 
Lowering amount of windows, tinting those that remain.
 2017-03-31 06:33:57 -04:00
Cw 3040 4dd23a0940 Minor Edits to Box 
Added larger maint bar, converted smaller maint bar to a storage room.
Pic related: http://i.imgur.com/iQR2aYG.png
 2017-03-31 05:53:35 -04:00
LetterJay d21d9fc854 map fix 2017-03-27 16:22:41 -05:00
TalkingCactusandGitHub 756180afd6 Automatic MC Re-Starter 9000 (#319) 
* fixed runtime in air.dm

fix was made in LINDA_turf_tile.dm though

* fixes runtime in corpse.dm

* fixes runtime in species.dm

* automatically restarts the MC sometimes

When the timer SS crashes, here's the fix

hardcoded with love

* supermatter area icon

* better admin logs

* better mentorhelp message for admins

* fixes map
 2017-03-27 03:16:56 -04:00
LetterJay e385849d72 hotfix for map 2017-03-26 12:35:12 -05:00
TalkingCactusandGitHub c997ebcabd Removes Lag (tm) (#313) 
* sensible fixes

* this too

* some more

* fixes chair icons

reverted to state before tg pull

* fixes telecomms icons

revert to state before tg pull

* fixes research icons

reverted to before tg pull

* de-whitewashed the stools

* fixed missing broadcaster sprites

* always load from the savefile

helps custom servers who don't want to fuck with the config, this will
never not be wanted with the system we have

* stop it, ghosts

* fixes limb augmentation

https://github.com/tgstation/tgstation/pull/25446

* removes lag

* re-adds sounds

* exception

* makes travis happy
 2017-03-26 09:39:29 -04:00
LetterJay e07580413f fuck 2017-03-24 02:08:02 -05:00
LetterJay 1d518bb4dd updates maploader, fixes a few things 2017-03-24 01:39:11 -05:00
PoojawaandGitHub 7ad5e22830 Wew lad (#305) 
* 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

* based cyberboss.

* you'd think github would suck less.

* vendors

* tweaks and specialty vendors.

* map things

* go away shitty omega

* qdeletion spam supress, maps.txt tweaks

* shuttle lights
 2017-03-22 02:55:33 -05:00
PoojawaandGitHub 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