shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,445 Commits 5 Branches 0 Tags
master
Commit Graph
416 Commits
Author SHA1 Message Date
LeoandCitadelStationBot 8101c5776a Merge pull request #31484 from Bawhoppen/berniesanders 
Removes portable chem dispenser from xenobio
 2017-10-10 07:09:21 -05:00
deathride58 5bd04f70d8 Readds kinkmates to delta and meta 2017-10-09 21:59:59 -04:00
LetterJay 8269450398 MapSync with /tg/ 2017-10-08 22:46:45 -05:00
deathride58andkevinz000 280b5f5e6f Adds kinkmates to Metastation and Deltastation (+Box tweaks) (#3214) 
* adds kinkmates to deltastation

* added kinkmates to metastation

* hides atmos pipes in maint dorms
 2017-10-07 22:52:43 -07:00
Jordan BrownandCitadelStationBot c6aec36f67 Merge pull request #31151 from Bawhoppen/122123 
Removes random junk from Metastation evidence closets
 2017-10-01 09:27:55 -05:00
orangesandCitadelStationBot 1a9d36b3f1 Merge pull request #31078 from pubby/opspawn 
Cleanup operative landmarks
 2017-09-28 21:48:11 -05:00
Jordan BrownandCitadelStationBot 0dd54affc4 Merge pull request #30995 from ShizCalev/map-fixes 
Map fixes
 2017-09-25 09:05:54 -05:00
CitadelStationBotandPoojawa 8ef3861b0b [MIRROR] New squeaky datum and plushes (#2847) 
* New squeaky datum and plushes

* Update bananashoes.dm
 2017-09-22 19:43:56 -05:00
CitadelStationBotandPoojawa ec65e75b10 [MIRROR] Fix MetaStation xenobio area (#2850) 
* Fix MetaStation xenobio area (#30830)

* Fix MetaStation xenobio area
 2017-09-22 19:10:18 -05:00
CitadelStationBotandPoojawa f778b3061c [MIRROR] Gives Deltastation's and Metastation's armory one more riot shotty (#2771) 
* share the love

* Gives Deltastation's and Metastation's armory one more riot shotty
 2017-09-17 23:07:55 -05:00
CitadelStationBotandPoojawa 83ec9b6d26 [MIRROR] Cleans up showcase & plaque varedits, updated loyalty implant references (#2768) 
* Cleans up showcase & plaque varedits, updated loyalty implant references (#30698)

* Cleans up showcase varedits

* drop_location for oldpods

* Plaques + more loyalty implant references

* Cleans up showcase & plaque varedits, updated loyalty implant references
 2017-09-17 23:07:05 -05:00
CitadelStationBotandPoojawa c8b153ee71 [MIRROR] Varedit cleanup mk4 (#2833) 
* Varedit cleanup mk4 (#30794)

* Cleans up and corrects a bunch of varedits

* Plant varedits

* More layers

* Adjusted plant name/description

* Varedit cleanup mk4
 2017-09-17 22:31:30 -05:00
CitadelStationBotandPoojawa b0b3e00c51 [MIRROR] Cleans up some chemmaster varedits (#2832) 
* Cleans up some chemmaster varedits (#30787)

* Cleans up some chemmaster varedits

* Moved the chemmaster on Omega.

* Cleans up some chemmaster varedits
 2017-09-17 22:27:17 -05:00
CitadelStationBotandPoojawa 1db4249fa1 [MIRROR] Adds Abandoned Airlocks (#2784) 
* Adds Abandoned Airlocks (#30705)

* Automatic changelog generation for PR #30056 [ci skip]

* Delete AutoChangeLog-pr-30056.yml

* Abandoned Airlocks

* Added to maps

* inclusive numbering

* Update airlock.dm

* Tweaks

* Capital ChangeTurf

* Update airlock.dm

* no more update_icons

* Abandoned paths (#4)

* Abandoned paths

* Cleaned up dirty var

* Adds Abandoned Airlocks
 2017-09-16 04:32:19 -05:00
CitadelStationBotandPoojawa 82d0aae420 [MIRROR] Changes shuttle port direction var from an angle to a dir (#2613) 
* Changes shuttle port direction var from an angle to a dir

* actually ports the directions

* Update shuttle.dm

* how
 2017-09-13 20:39:55 -05:00
PoojawaandGitHub 8406baebbe Makes APC cell_type actually pick a cell (#2747) 
* Ports TG#30327

* Update apc.dm

* maybe delta can be fully copies over, yes?
 2017-09-13 19:57:21 -05:00
CitadelStationBot 50b88388da Crew monitoring rework part 1: crew pinpointers 2017-08-30 17:03:20 -05:00
CitadelStationBot 12ff0e7406 Removes the suppose-to-be unused shuttle wall path 2017-08-28 02:20:45 -05:00
kevinz000andGitHub c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460) 
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
 2017-08-24 21:07:58 -07:00
LetterJayandkevinz000 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBotandPoojawa 8a4ddbe8a8 [MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162) 
* Ports Rapid Cable Layers from /vg/ and paradise

* rej clean up + manual sync

* maps and .rej file cleanup

* sprite and WGW memes

* actual spellchecked memes

* some other map fix memes

* fuck it, let's just hard sync maps

* dumb paperwork shit for maps

* Revert "dumb paperwork shit for maps"

This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.

* *autistic screeching*

* REEEEEEEEEEEEEEEEEEEEE

* Fuck off I want to do something else
 2017-08-02 04:56:44 -05:00
CitadelStationBotandPoojawa 76f7fcef9a [MIRROR] Cleaned up paper varedits + tidied up paths (#2156) 
* Cleaned up paper varedits + tidied up paths

* work smarter, not harder

* citadel snowflake

* Update uplink_item_cit.dm
 2017-08-02 03:17:32 -05:00
LetterJayandGitHub 70a5aed428 Merge pull request #2054 from Citadel-Station-13/upstream-merge-28977 
[MIRROR] Augment Styles/Changes
 2017-07-29 23:56:52 -05:00
CitadelStationBot b998e14a5b Map Spellcheck 2017-07-24 21:16:46 -05:00
CitadelStationBot 0ce34e08b6 Augment Styles/Changes 2017-07-18 06:45:44 -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
CitadelStationBotandkevinz000 ce82313f30 Alters Meta's robo resources to an amount closer to Box's (#1966) 2017-07-10 16:13:27 -07:00
TalkingCactusandGitHub cb5247d060 Fixes Gamemode Voting & Map Edits (#1937) 
* fixes roundtype voting

* keg spawner

* maint bar to box and kinkmates to delta+meta
 2017-07-07 17:54:53 -04:00
LetterJayandGitHub 85b4996267 Merge pull request #1912 from Citadel-Station-13/upstream-merge-29062 
[MIRROR] Adds wires to armory on Meta
 2017-07-06 22:46:15 -05:00
CitadelStationBot d653febeb2 Adds wires to armory on Meta 2017-07-06 19:19:31 -05:00
CitadelStationBot 990aec3d14 Replaces useless teleporter consoles on bridge 2017-07-06 19:18:14 -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
LetterJayandGitHub ed6c0b042e Merge pull request #1508 from Citadel-Station-13/upstream-merge-28227 
[MIRROR] Clown Toy Box + Wooden Crates
 2017-06-26 04:29:08 -05:00
LetterJay eb055bc1ec more and more 2017-06-19 16:56:38 -05:00
LetterJayandGitHub 7189249f66 Merge pull request #1445 from Citadel-Station-13/upstream-merge-28115 
[MIRROR] A large and unasked for  repath and improvement of accessories (formerly ties, but actually armbands and medals)
 2017-06-10 09:01:25 -05:00
CitadelStationBot f26cf4e9ef Clown Toy Box + Wooden Crates 2017-06-09 11:02:37 -05:00
CitadelStationBot 356ea18e95 [Meta] atmosia pump layer fix 2017-06-08 17:16:56 -05:00
CitadelStationBot 9725329268 A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) 2017-06-07 03:06:15 -05:00
CitadelStationBot 946a6b1146 [Meta] Var Cleanup and tweaks 2017-05-31 08:57:18 -05:00
LetterJay 7d9865955b master maps 2017-05-30 22:47:08 -05:00
LetterJay a60ad3264a commit 2017-05-30 20:31:45 -05:00
LetterJay 8948f2d636 FIXING SHIT. 2017-05-30 20:16:00 -05:00
CitadelStationBot db4b764aea [All stations] Cleaned up var-editted areas 2017-05-21 22:29:41 -05:00
CitadelStationBotandPoojawa 67c0463bbb Removes that description on the Second MetaStation Sign (#1007) 2017-05-18 12:24:16 -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
CitadelStationBotandkevinz000 bec5a73f6c Tweak Meta Kill Room Areas (#883) 2017-05-10 16:11:43 -07:00
CitadelStationBotandkevinz000 8e0e77cd35 Nerfs Chaplain smoke book. (#758) 2017-05-08 16:45:59 -07:00