shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,306 Commits 5 Branches 0 Tags
85c8d4852fc9db07552ee6d2cf38d7f0bdbf172e
Commit Graph

833 Commits

Author SHA1 Message Date
Tupinambis 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
deathride58 4cdd0177d8 Merge pull request #7407 from nik707/metachanges 
Metachanges
 2018-08-20 04:58:14 -04:00
Tupinambis 4b21b60269 Deep Storage Suit Loot Update. (Alternative to PR #7402) (#7449) 
* Replaces syndicate hardsuit with mining hardsuit.

* adds jetpack
 2018-08-16 13:02:11 -07:00
nik707 d8157e71e9 Merge branch 'master' into metachanges 2018-08-12 19:42:32 -05:00
deathride58 9dfc0eeb87 Merge pull request #7439 from Citadel-Station-13/sliding_puzzle_port 
Manual mirror of sliding puzzles from /tg/, as a lavaland ruin, and an admin smite
 2018-08-12 20:38:27 -04:00
nik707 7bd8907b9b Revert "adds secpod" 
This reverts commit cdd37e268f.
 2018-08-08 20:05:54 -05:00
kevinz000 4ff02b5a8b Sliding Puzzle 2018-08-07 04:44:12 -07: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 d23f0b23a3 Hopefully working re-merge of #7391 with some other minor tweaks (#7401) 
* [s] Hopefully working re-merge of #7391

* pubby changes 2: electric boogaloo.

* another small fix

* adds missing camera

* extremely critical addition of a jukebox to pubby bar

* fucking missed a disposal pipe kill me <3

* fixes medbay disposals

* Update .gitignore
 2018-08-03 19:32:19 -07: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 3040 051735f245 Revert "reopens corridor between chem and rnd (#7391)" 
This reverts commit 45ce574513.
 2018-07-21 23:53:00 -04:00
nik707 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 N e54cf2ce21 pubbypubbypubby 2018-07-07 22:05:04 +08:00
Letter N c3bdd0f3bb omegaomegaomega 2018-07-07 22:03:55 +08:00
Letter N e05ca517ad metametametagame 2018-07-07 22:02:45 +08:00
Letter N 084e8b4e00 deltadeltadelta 2018-07-07 22:01:49 +08:00
Letter N 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
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