shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,371 Commits 5 Branches 0 Tags
5a390937aebfa1023051fc4e348cd1c3bf7bfbd2
Commit Graph

361 Commits

Author SHA1 Message Date
oranges
ad08855056 Merge pull request #31291 from ShizCalev/shuttle-templates 
Cleans up non-timid shuttle templates & some dirty vars
 2017-10-05 03:04:22 -05:00
ShizCalev
d98cd745dd Fixes morgue maintenance radstorm protection (#31253) 
* Morgue maint area

* Fixed typo
 2017-10-03 17:11:57 -05:00
LetterJay
aec96bbbbe Merge pull request #2906 from deathride58/ashwalkerkinkmates 
Adds dildos to ashwalker ruin
 2017-10-03 15:23:07 -04:00
LetterJay
cec44fa601 Merge pull request #3055 from Citadel-Station-13/upstream-merge-31151 
[MIRROR] Removes random junk from Metastation evidence closets
 2017-10-01 23:37:18 -04:00
LetterJay
e17455165c Merge pull request #3043 from Citadel-Station-13/upstream-merge-31144 
[MIRROR] moved the goddamn locker in toxins maint
 2017-10-01 15:55:29 -04:00
LetterJay
bf2155ec21 Merge pull request #3018 from Citadel-Station-13/upstream-merge-31083 
[MIRROR] Removes step throwers from cult altar
 2017-10-01 15:08:10 -04:00
Jordan Brown
c6aec36f67 Merge pull request #31151 from Bawhoppen/122123 
Removes random junk from Metastation evidence closets
 2017-10-01 09:27:55 -05:00
Qbopper
048c31c6a2 moved the goddamn locker (#31144) 2017-10-01 00:20:38 -05:00
LetterJay
f55c86edfb Merge branch 'master' into upstream-merge-31045 2017-10-01 01:17:52 -04:00
LetterJay
47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04:00
KorPhaeron
d3c37c83de Removes step throwers from cult altar (#31083) 2017-09-30 01:00:12 -05:00
LetterJay
d6a89948a2 Merge pull request #2991 from Citadel-Station-13/upstream-merge-31078 
[MIRROR] Cleanup operative landmarks
 2017-09-29 01:44:17 -04:00
Joan Lung
e4b4860e44 Reebe is fancier now 2017-09-28 21:59:05 -05:00
oranges
1a9d36b3f1 Merge pull request #31078 from pubby/opspawn 
Cleanup operative landmarks
 2017-09-28 21:48:11 -05:00
ShizCalev
08dcd65a63 Fixes omega air injector (#31059) 2017-09-28 21:46:49 -05:00
LetterJay
50f139eb8d Merge pull request #2937 from Citadel-Station-13/upstream-merge-30995 
[MIRROR] Map fixes
 2017-09-27 20:08:54 -04:00
Ashe Higgs
e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
Jordan Brown
0dd54affc4 Merge pull request #30995 from ShizCalev/map-fixes 
Map fixes
 2017-09-25 09:05:54 -05:00
pubby
34e186dadb Datum abductors refactor 2017-09-24 18:00:49 -05:00
deathride58
5ca691894c adds dildos to ashwalker ruin 2017-09-23 02:37:43 -04:00
CitadelStationBot
117c8bf04d [MIRROR] Adds bioclosets to omega medbay, sci, and sec (#2889) 
* Merge pull request #30903 from ShizCalev/omega-bio-closets

Adds bioclosets to omega medbay, sci, and sec

* Adds bioclosets to omega medbay, sci, and sec
 2017-09-22 22:31:27 -05:00
CitadelStationBot
6efb76fad5 [MIRROR] Ammo cleanup (#2643) 
* Ammo cleanup

* Update briefcase.dm

* Update manned_turret.dm

* Update mime.dm

* Update manned_turret.dm

* Update manned_turret.dm

* fixes

* mime memes
 2017-09-22 22:30:44 -05:00
CitadelStationBot
bf1e4a456f [MIRROR] Improve atmos components code + OmegaStation fixes (#2752) 
* Improve atmos components code + OmegaStation fixes

* Update circulator.dm

* Update dp_vent_pump.dm

* Update pump.dm

* Update volume_pump.dm

* Update pump.dm

* Update pump.dm

* Update volume_pump.dm

* fixes pumps shows area rather than vague jump

also removes it from admin log, wew

* wew
 2017-09-22 20:05:58 -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
CitadelStationBot
ec65e75b10 [MIRROR] Fix MetaStation xenobio area (#2850) 
* Fix MetaStation xenobio area (#30830)

* Fix MetaStation xenobio area
 2017-09-22 19:10:18 -05:00
CitadelStationBot
628a2442e2 [MIRROR] Slightly remaps and adds more supplies to the animal hospital ruin (#2705) 
* Merge pull request #30505 from Xhuis/vet_remap

Slightly remaps and adds more supplies to the animal hospital ruin

* Slightly remaps and adds more supplies to the animal hospital ruin
 2017-09-19 06:37:56 -05:00
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
e2e85e9294 [MIRROR] Window Spawner Refactor (#2815) 
* Window spawner refactor (#30747)

* Window Spawner Refactor
 2017-09-17 22:42:22 -05:00
CitadelStationBot
0187068b6a [MIRROR] Omega fixes (#2816) 
* Omega fixes (#30779)

* Omega fixes
 2017-09-17 22:36:49 -05:00
CitadelStationBot
4dd0dc9d66 [MIRROR] Various grammar fixes (#2842) 
* Various grammar fixes

* Update mecha_parts.dm

* Update crates.dm

* Update ghost_role_spawners.dm

* Update paper_premade.dm

* Update oldstation.dm
 2017-09-17 22:35:51 -05:00
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
d64c23b7f9 [MIRROR] Fix syndicate toy C20r and L6 Saw not having riot darts (#2740) 
* Fix syndicate toy C20r and L6 Saw not having riot darts  (#30645)

*   Add riot darts back into toy C20r and L6 Saw

Riot darts were removed from the unrestricted variants of these guns, also changed these ruins to use the new /riot variant in order to maintain original functionality.

* Comments are good

Especially when inheritance makes everything weird.

* Fix syndicate toy C20r and L6 Saw not having riot darts
 2017-09-13 20:57:54 -05:00
CitadelStationBot
3b144c423c [MIRROR] Fix CentCom issues (#2619) 
* Fix CentCom issues

* Actually ports fixes
 2017-09-13 20:43:11 -05:00
CitadelStationBot
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
Poojawa
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
9d52a495b2 [MIRROR] Fix monastery shuttle + Pods (#2599) 
* Fix monastery shuttle + Pods

* actually ports podfix
 2017-09-13 17:58:25 -05:00
CitadelStationBot
86ebef0f04 [MIRROR] Fixed pubby emergency shuttle (#2574) 
* Fixed pubby emergency shuttle

* actually fixes Pubby
 2017-09-13 17:57:41 -05:00
CitadelStationBot
63ebf08a0d [MIRROR] Adds shovels to the golem ship (#2742) 
* Adds shovels to the golem ship

* Adds shovels to the golem ship
 2017-09-13 16:56:30 -05:00
LetterJay
a5a8f8faba Merge pull request #2691 from Citadel-Station-13/upstream-merge-30530 
[MIRROR] Adds Gondoland and the rare Gondolas
 2017-09-12 01:21:09 -05:00
LetterJay
16c7706618 Merge branch 'master' into upstream-merge-30117 2017-09-11 18:10:15 -05:00
Militaires
3aec72d4f4 Adds Gondoland and the rare Gondolas (#30530) 
A strange race of bear-like beings consisting of a head placed DIRECTLY on a pair of legs, their fur sells for extremely high prices.

The gondoland asteroid is the last natural habitat for these rare creatures.
 2017-09-10 17:10:45 -05:00
ShizCalev
849deb5e4e Cleans up more paper fluff varedits. (#30418) 2017-09-06 18:42:43 -05:00
Poojawa
e13ff54c44 disables Pubby from rotation (#2624) 2017-09-06 07:05:16 -05:00
LetterJay
8ac267eafa Merge pull request #2567 from Citadel-Station-13/upstream-merge-30277 
[MIRROR] Fixed Omega comms power
 2017-08-31 22:24:37 -05:00
CitadelStationBot
4b202faa1e Tiny PubbyStation update 2017-08-30 17:06:42 -05:00
CitadelStationBot
e2a7a40ce2 Fixed Omega comms power 2017-08-30 17:06:29 -05:00
CitadelStationBot
50b88388da Crew monitoring rework part 1: crew pinpointers 2017-08-30 17:03:20 -05:00