shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,865 Commits 5 Branches 0 Tags
2d3969882a9db26b3cea9080036f047382e95265
Commit Graph

803 Commits

Author SHA1 Message Date
LetterJay
acd10b02cf Merge pull request #7195 from Citadel-Station-13/upstream-merge-38574 
[MIRROR] Global component signals
 2018-06-24 18:20:17 -05:00
Jordan Brown
c11557d23d Global component signals 2018-06-19 17:18:34 -05:00
Jordan Brown
2cd16aa1ad Fix some shuttle chair stuff (#38557) 
* Fix shuttle chair stuff

* Remove redundancy
 2018-06-19 01:29:17 -05:00
LetterJay
7ab66531bf Merge pull request #7162 from Citadel-Station-13/upstream-merge-38539 
[MIRROR] Adds New Shuttle Chairs
 2018-06-18 21:58:42 -05:00
LetterJay
50da00b26c Merge pull request #7161 from Citadel-Station-13/upstream-merge-38540 
[MIRROR] Cleans up supermatter related varedits
 2018-06-18 21:58:15 -05:00
Cw 3040
27b6ebc612 Cw's Spaceruins, Maintbar and Kegspawn changes (#7141) 
* Station Changes

-Added Jukebox to: Box (maintbar), Meta (maintbar), Pubby (maintbar),
and Omega (maintarcade)
-Added keg spawn to Pubby
-Removed Legcuffs and Rifle Stock from Box maintbar (people were unhappy
with the fact these were sprited identically to handcuffs, will re-add
if someone ports Virgo's legcuffs)

* Space Ruins Changes

-Added KinkMates to SpaceHotel
-Swapped riot helmet for AI detecting multitool on TurretedOutpost
-Changed the loot for oldAIsat to not have a suspicious toolbox, instead
having a toolbelt and combat gloves

* Kegspawn Change

Changed Spawn Rate of kegs to:
-50% mead (5 in 10 instead of 5 in 8)
-20% aphro (2 in 10 instead of 1 in 8)
-20% strong aphro (2 in 10 instead of 1 in 8)
-10% pan galactic gargle blaster (1 in 10 instead of 1 in 8)

* Small MetaStation Fixes

Fixed bug reported by Nethaufer (Zig)#5868 on discord, there was a wire
(and an air supply pipe) accidentally deleted.
 2018-06-18 11:52:11 -07:00
LetterJay
389e9584a3 Merge pull request #7167 from Citadel-Station-13/upstream-merge-38521 
[MIRROR] Fix protolathe in Pubby circuit lab
 2018-06-18 12:30:52 -05:00
LetterJay
6d74717b39 Merge pull request #7158 from Citadel-Station-13/upstream-merge-38533 
[MIRROR] Adds dance machine, drink dispensers, flavor to beach bum ruin
 2018-06-18 12:27:45 -05:00
LetterJay
56286eefaa Merge pull request #7145 from Citadel-Station-13/upstream-merge-38523 
[MIRROR] Fix Meta and Delta escape pod rooms having no air
 2018-06-18 10:11:06 -05:00
LetterJay
78265ad51b Merge pull request #7144 from Citadel-Station-13/upstream-merge-38524 
[MIRROR] Fix some of the Lavaland roundstart atmos active turfs
 2018-06-18 10:10:49 -05:00
LetterJay
e298e283ee Merge pull request #7142 from Citadel-Station-13/upstream-merge-38504 
[MIRROR] Makes the xeno nest ruin harder to cheese.
 2018-06-18 10:10:07 -05:00
LetterJay
90df70a8f1 Merge pull request #7134 from Citadel-Station-13/upstream-merge-38509 
[MIRROR] Makes the caravan ambush ruin harder to cheese
 2018-06-18 09:53:05 -05:00
Jordan Brown
ce66967811 Merge pull request #38521 from AutomaticFrenzy/patch/pubby 
Fix protolathe in Pubby circuit lab
 2018-06-18 09:39:14 -05:00
fludd12
96b620d540 Adds New Shuttle Chairs (#38539) 
* I'm crashing this shuttle with no survivors.

* comma comma comma comma comma chameleon
 2018-06-18 09:38:25 -05:00
81Denton
9b1f891a29 Cleans up supermatter related varedits (#38540) 
* Cleans up supermatter related varedits

* reee

* fakecrystal
 2018-06-18 09:38:16 -05:00
81Denton
241d0c7a9a Adds dance machine, drink dispensers, flavor to beach bum ruin (#38533) 
* shit was SO cash

* correct dance machine subtype

* moves defines from map file to corpse.dm

* improves bartender flavor text

* adds special shadycigs for beach ruin, adds shower, moves bartender sleeper to backroom
 2018-06-18 09:37:48 -05:00
Tad Hardesty
a5a2681baa Fix Meta and Delta escape pod rooms having no air (#38523) 2018-06-17 03:15:28 -05:00
Tad Hardesty
27b80045ad Fix some of the Lavaland roundstart atmos active turfs (#38524) 2018-06-17 03:15:08 -05:00
Dax Dupont
f5132ba0fc Makes the xeno nest ruin harder to cheese. (#38504) 
* Makes the xeno nest ruin harder to cheese.

* space
 2018-06-16 21:47:16 -05:00
LetterJay
9b4b98de27 Merge pull request #7121 from Citadel-Station-13/upstream-merge-38481 
[MIRROR] Fix security disposals on pubby and a few other things
 2018-06-16 16:41:49 -05:00
81Denton
e92060a3a9 Makes the caravan ambush ruin harder to cheese (#38509) 
* makes caravan ambush more challenging

* SMASH
 2018-06-16 15:38:34 -05:00
pubby
1b5fc0d705 Fix security disposals on pubby and a few other things (#38481) 
* Fix security disposals on pubby and a few other things

* Also fix floating grilles on pubby's east solar array
 2018-06-16 06:19:01 -05:00
Dax Dupont
e5b95cfcdd Some minor pubby shuttle tweaks (#38489) 
* Some minor pubby shuttle tweaks

* no step

* Good idea denton

* thanks guys
 2018-06-16 06:17:57 -05:00
Cw 3040
011d5691ed Ninja Holding Area Change (#7088) 
bathroom's turfs changed from /turf/.../plasteel/airless/white to
/turf/.../plasteel/white like they should be
 2018-06-14 09:57:01 -07:00
Cw3040
fd1a93907f Box Fix 
Accidentally deleted a disposals pipe in Maint, this rectifies that.
 2018-06-08 20:21:10 -04:00
Cw3040
d5e3001261 Changes 
This should fix Travis's issue.
 2018-06-07 21:14:21 -04:00
Cw3040
45ec368d76 Pubby Changes 
-Added Cryogenics
-Kinkmates, of course.
-Keg in maint bar
 2018-06-07 20:53:15 -04:00
Cw3040
b833a88204 MetaStation Changes 
Added Cryosleepers and KinkMates
 2018-06-07 20:44:02 -04:00
Cw3040
fa2cbe7fdc BoxStation Changes 
-Maintbar
-Added Cryosleepers
-Added KinkMate in Locker Room
 2018-06-07 20:43:22 -04:00
81Denton
e3f9229e08 Fixes Pubby maint boozeomat (#38300) 2018-06-06 02:36:34 -05:00
deathride58
255ffb96bb Merge branch 'master' into upstream-merge-38179 2018-06-05 21:32:22 +00:00
CitadelStationBot
0b362e017b [MIRROR] Lavaland Clock Cult Ruin (#7011) 
* Lavaland Clock Cult Ruin (#38263)

* Dead Ratvar

* tgm map

* Lavaland Clock Cult Ruin
 2018-06-05 11:16:55 -07:00
LetterJay
5997b69de1 Merge pull request #6995 from Citadel-Station-13/upstream-merge-38240 
[MIRROR] Replaces airlock_controller/incinerator related varedits with defines/subtypes
 2018-06-05 12:11:34 -05:00
LetterJay
b94207ed11 Merge pull request #6994 from Citadel-Station-13/upstream-merge-38223 
[MIRROR] Slight changes to camera network code
 2018-06-05 12:11:19 -05:00
LetterJay
c98f998473 Merge pull request #6997 from Citadel-Station-13/upstream-merge-38233 
[MIRROR] Replaces the black-and-red spacesuit on the infiltrator with a normal syndicate red fatsuit
 2018-06-03 16:20:58 -05:00
LetterJay
391d4f1cfa Merge pull request #6996 from Citadel-Station-13/upstream-merge-38245 
[MIRROR] Readds missing objs to Delta toxins
 2018-06-03 16:20:30 -05:00
LetterJay
54296cc3e5 Merge pull request #6989 from Citadel-Station-13/upstream-merge-38226 
[MIRROR] Roboticists now have access to open the R&D windoors.
 2018-06-03 16:19:59 -05:00
iksyp
42e5ded9b3 fatsuits (#38233) 2018-06-03 11:05:45 -05:00
81Denton
8b4a3ab273 Readds missing objs to Delta toxins (#38245) 
* prb: no update

* another one
 2018-06-03 11:04:30 -05:00
81Denton
0d42b1c4d1 Replaces airlock_controller/incinerator related varedits with defines/subtypes 2018-06-03 11:03:14 -05:00
Jalleo
d3f34517dc Slight changes to camera network code 2018-06-03 09:04:24 -05:00
theo2003
b9ac5c0544 Roboticists now have access to open the R&D windoors. (#38226) 2018-06-03 09:03:42 -05:00
KorPhaeron
4b38136d79 Only load Reebe during clock cult (#38156) 
* Only load clock cult during clock cult

* Return FALSE
 2018-06-03 09:02:55 -05:00
LetterJay
3b498f2288 map fix 2018-06-02 05:41:31 -05:00
Jordan Brown
34f59b7a48 Merge pull request #38179 from AutomaticFrenzy/patch/pubby-aux 
Fix Pubby auxiliary mining base
 2018-06-01 09:48:37 -05:00
Cruix
9c4f4ce17f AI Multicamera mode (#37695) 
* Added multicamera mode for AIs

* Minor multicamera fixes

* Cameras near an AI multicamera eye now light up red

* Disabled AI multicamera mode without admin intervention

* Fixed AIs being able to use multicamera mode when they should not
 2018-05-31 22:41:48 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
CitadelStationBot
1ce820d2ed [MIRROR] Adds action features to the metastation beerkeg-nukes (#6925) 
* Adds action features to the metastation beerkeg-nukes (#38084)

* Hottomonkulu Pyynö mos kyren hepität. Nerse marentaat aluturnate.

* Masennoo sum keuron väkeltäät vassem Pyynö er borsalitaat Urmas.

* Tarnatat kuulor ustanitat vernes heuremasso seurutik Pyynör kanervo mahkatosimos. Atti ivakhan nutiv.

* Surmustulet nasnas kyhille nes viuhuntut sepelitör arnisansatin.

* Adds action features to the metastation beerkeg-nukes

* Test 1

* Test 2

* Test 3
 2018-05-27 19:32:09 -07:00
CitadelStationBot
d62cb31e9b [MIRROR] Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile (#6884) 
* Delete some duplicate macro definitions

* sql changelog changes ping the host

* Templates the caravan ambush ruin shuttles

* Update CODEOWNERS

* Update components.dm

* Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile

* Initial Placeholder

* Update caravanambush.dmm
 2018-05-27 19:27:56 -07:00
LetterJay
69af2087aa Merge pull request #6848 from Citadel-Station-13/upstream-merge-37631 
[MIRROR] Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision
 2018-05-27 01:32:02 -05:00