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

382 Commits

Author SHA1 Message Date
LetterJay
5e99ad27e5 Merge pull request #3287 from Citadel-Station-13/upstream-merge-30920 
[MIRROR] Adds the Chemistry Smoke Machine
 2017-10-10 22:31:27 -04:00
LetterJay
1191ccf9de Merge pull request #3285 from Citadel-Station-13/upstream-merge-31505 
[MIRROR] Fixes crashed ship runtime
 2017-10-10 22:30:42 -04:00
Robustin
a570ec8610 Adds the Chemistry Smoke Machine (#30920) 
* Smoke Machine

* Tweak

* More responsive smoke timing

* Antur Review and Admin Logs

* Cboss review

* More logging

* Removes analyze, streamlines logs

* r-e-a

* no s in reagents_list

* Cyberboss Review

* woops

* Cboss nitpicking
 2017-10-10 13:13:38 -05:00
Jordan Brown
039b6ae9ce Merge pull request #31505 from ShizCalev/crashed-ship-fix 
Fixes crashed ship runtime
 2017-10-10 12:42:52 -05:00
Leo
8101c5776a Merge pull request #31484 from Bawhoppen/berniesanders 
Removes portable chem dispenser from xenobio
 2017-10-10 07:09:21 -05:00
oranges
304c07fb7e Merge pull request #31394 from ninjanomnom/asteroid-shuttle 
Makes the asteroid escape shuttle throw people
 2017-10-10 03:07:31 -05:00
LetterJay
3082f82ead Merge pull request #3263 from deathride58/readdkinkmates 
Readds kinkmates to delta and meta
 2017-10-09 23:02:46 -04:00
deathride58
5bd04f70d8 Readds kinkmates to delta and meta 2017-10-09 21:59:59 -04:00
deathride58
45ed5812c5 Fixes cameras 2017-10-09 20:48:30 -04:00
deathride58
21820de896 changes arrivals security checkpoint to customs 2017-10-09 15:18:08 -04:00
deathride58
2bbe4bd6e8 MAP MERGER 2017-10-09 14:46:33 -04:00
deathride58
501a09fee3 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into furryhippie 2017-10-09 14:42:47 -04:00
LetterJay
8269450398 MapSync with /tg/ 2017-10-08 22:46:45 -05:00
deathride58
55d5d8ec20 actually gives grav generator power, removes stray stool in bar, and removes hazard lines from below vault checkpoint 2017-10-08 18:58:31 -04:00
deathride58
c3f8a9da2c adds clown and mime offices, adds abandoned cafe, makes maint bar all access 2017-10-08 17:26:00 -04:00
deathride58
8b23b6993c we furry hippie now 2017-10-08 05:15:30 -04:00
deathride58
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
kevinz000
614caa782a Adds a rdconsole to omegastation robotics (#31380) 2017-10-07 08:36:52 -05:00
LetterJay
9a106dc1c6 Merge pull request #3175 from Citadel-Station-13/upstream-merge-31335 
[MIRROR] [Delta] Adds missing warning lines under firedoors in xeno
 2017-10-06 23:20:44 -04:00
deathride58
7e053c280d Box Maint Bar Mk. 3 (#3174) 
* readds maint bar + adds maint dorms

* adds extra fancy stuff

* adds lights to maint bar
 2017-10-06 11:37:44 -07:00
ShizCalev
a1202bcec7 Adds missing warning lines under firedoors in xeno 2017-10-06 01:34:25 -05:00
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