shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,332 Commits 5 Branches 0 Tags
b1f455ccafa4aa470377fd7626a7e8add4e75c3c
Commit Graph
602 Commits
Author SHA1 Message Date
deathride58andGitHub 15fd819c29 Merge pull request #7476 from nik707/pubby-changes 
fixes the fuckin backwards treadmills in the trash compactor
 2018-08-23 03:48:36 -04:00
deathride58andGitHub c285261134 Merge pull request #7484 from nik707/boxchanges 
changes maint areas near sec
 2018-08-23 03:41:29 -04:00
Tupinambisandkevinz000 0e67143ca1 Removes the tesla coils from engineering secure storage, and places them within the engine room, functional upon being wrenched down. (Arranged in the common method of three coils on the left and right sides.) (#7445) 
Reduces the width of engineering secure storage and its blast door by one tile. The machinery within has been rearranged in order to make the most commonly used machinery the most accessible.
 2018-08-23 00:29:18 -07:00
Tupinambisandkevinz000 a1bd981c7c Improves toxins by unbolting toxin chamber doors, and leaving the toxins air alarm unlocked at round start. Move pipes to a less obstructive location. Adds bomb hardsuit to box. (#7473) 2018-08-23 00:26:05 -07:00
nik707 f76127ffc2 changes maint areas near sec 2018-08-21 03:21:59 -05:00
nik707 b571c82b00 fixes small error 2018-08-20 03:12:43 -05:00
nik707 b061e44873 fixes the fuckin backwards treadmills in the trash compactor 2018-08-20 01:53:05 -05:00
nik707andGitHub d8157e71e9 Merge branch 'master' into metachanges 2018-08-12 19:42:32 -05:00
nik707 7bd8907b9b Revert "adds secpod" 
This reverts commit cdd37e268f.
 2018-08-08 20:05:54 -05:00
nik707 cdd37e268f adds secpod 2018-08-06 01:36:32 -05:00
nik707 fbf1774bc9 fix for command greytide 2018-08-06 00:30:09 -05:00
nik707 abd40802aa fixes medbay disposals 2018-08-01 19:45:56 -05:00
nik707 70fc9ce348 fucking missed a disposal pipe kill me <3 2018-07-31 14:32:32 -05:00
nik707 afa8003451 extremely critical addition of a jukebox to pubby bar 2018-07-29 12:20:10 -05:00
nik707 60ed121a58 adds missing camera 2018-07-26 14:19:14 -05:00
nik707 698727e18a adds a seemingly missing light to a dark corner in engineering 2018-07-25 19:38:18 -05:00
nik707 d41dd29a0d Revert "readds missing light in engineering" 
This reverts commit 6b7a0f5eab.
 2018-07-25 19:32:54 -05:00
nik707 6b7a0f5eab readds missing light in engineering 2018-07-25 19:31:48 -05:00
nik707 db7465910e another small fix 2018-07-23 18:44:44 -05:00
nik707 ae6d1b623a pubby changes 2: electric boogaloo. 2018-07-23 14:39:09 -05:00
nik707 31424150a6 [s] Hopefully working re-merge of #7391 2018-07-22 16:36:30 -05:00
Cw 3040andGitHub 051735f245 Revert "reopens corridor between chem and rnd (#7391)" 
This reverts commit 45ce574513.
 2018-07-21 23:53:00 -04:00
nik707andkevinz000 45ce574513 reopens corridor between chem and rnd (#7391) 
* pubbystationv1

This is a relatively minor change that reopens the central corridor between RND and Chemistry, each losing a negligable amount of space as a result. Will make navigating pubby a bit easier.

* removed mention of step_x
 2018-07-21 18:32:26 -07:00
Letter NandGitHub e54cf2ce21 pubbypubbypubby 2018-07-07 22:05:04 +08:00
Letter NandGitHub c3bdd0f3bb omegaomegaomega 2018-07-07 22:03:55 +08:00
Letter NandGitHub e05ca517ad metametametagame 2018-07-07 22:02:45 +08:00
Letter NandGitHub 084e8b4e00 deltadeltadelta 2018-07-07 22:01:49 +08:00
Letter NandGitHub 958249ba03 boxboxbox 2018-07-07 22:00:46 +08:00
deathride58 8d8035950e Fixes centcom titlescreen resolution, finally 2018-07-05 04:23:12 -04:00
deathride58 3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58 db2a15d42d maps, tools, goon folder, icons, sounds, and strings. everything except code 2018-07-01 23:54:31 -04:00
LetterJayandGitHub 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 3040andkevinz000 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
LetterJayandGitHub 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
Jordan Brownandletterjay ce66967811 Merge pull request #38521 from AutomaticFrenzy/patch/pubby 
Fix protolathe in Pubby circuit lab
 2018-06-18 09:39:14 -05:00
81Dentonandletterjay 9b1f891a29 Cleans up supermatter related varedits (#38540) 
* Cleans up supermatter related varedits

* reee

* fakecrystal
 2018-06-18 09:38:16 -05:00
Tad Hardestyandletterjay a5a2681baa Fix Meta and Delta escape pod rooms having no air (#38523) 2018-06-17 03:15:28 -05:00
pubbyandletterjay 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
Cw 3040andkevinz000 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
81Dentonandletterjay e3f9229e08 Fixes Pubby maint boozeomat (#38300) 2018-06-06 02:36:34 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
81Dentonandletterjay 8b4a3ab273 Readds missing objs to Delta toxins (#38245) 
* prb: no update

* another one
 2018-06-03 11:04:30 -05:00
81Dentonandletterjay 0d42b1c4d1 Replaces airlock_controller/incinerator related varedits with defines/subtypes 2018-06-03 11:03:14 -05:00