shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,743 Commits 5 Branches 0 Tags
582b9f2a75ddee26a9d0f81f5eead077841ebcc2
Commit Graph
17743 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub 582b9f2a75 Merge pull request #7186 from Citadel-Station-13/upstream-merge-38592 
[MIRROR] [s] Fixes direct sql datum call exploit.
 2018-06-24 15:06:02 -05:00
LetterJayandGitHub 6685bfcc8b Update dbcore.dm 2018-06-24 15:04:24 -05:00
CitadelStationBotandkevinz000 386bc528ea [MIRROR] Add logging to teleport and the teleporter destination setting (#7225) 
* Add logging to teleport and the teleporter destination setting (#38645)

Helps with some admin issues

* Add logging to teleport and the teleporter destination setting
 2018-06-22 00:34:41 -07:00
CitadelStationBotandkevinz000 f02a99f901 [MIRROR] Fixes HE pipes not respecting layering (#7223) 
* Fixes HE pipes not respecting layering (#38468)

* HE pipes fix

* Heat exchange stuff

* Fixes HE pipes not respecting layering
 2018-06-22 00:16:50 -07:00
CitadelStationBot d0f68daa21 Automatic changelog generation for PR #7207 [ci skip] 2018-06-21 00:40:56 -05:00
CitadelStationBotandkevinz000 f393d68499 [MIRROR] fixes anomaly cores being flamable (#7207) 
* fixes anomaly cores being flamable (#38607)

* oranges-is-gay

* swap

* fixes anomaly cores being flamable
 2018-06-20 22:40:54 -07:00
CitadelStationBotandkevinz000 3d1faff99b [MIRROR] Adds desc to IV drips (#7205) 
* Merge pull request #38608 from 81Denton/iv-drip-desc

Adds desc to IV drips

* Adds desc to IV drips
 2018-06-20 22:39:29 -07:00
CitadelStationBot 7cb838b4cf Automatic changelog generation for PR #7199 [ci skip] 2018-06-20 19:23:04 -05:00
CitadelStationBotandkevinz000 25ba25d997 [MIRROR] [s]Fixed being able to create nearly infinite amount of materials from autolathes (#7199) 
* [s]Fixed being able to create nearly infinite amount of materials from autolathes (#38624)

* clamper-oni

* Update autolathe.dm

* Update autolathe.dm

* [s]Fixed being able to create nearly infinite amount of materials from autolathes
 2018-06-20 17:23:02 -07:00
CitadelStationBotandkevinz000 49a34614cd [MIRROR] Admin Kicks now prompt the admin to avoid accidental kicking (#7191) 
* Admin Kicks now prompt the admin to avoid accidental kicking (#38544)

* TO THE PLAAAAAACE I BELOOOOOONG

* TAKE ME HOOOOOOOOOOME

* WEEEEEEST VIRGINIAAAAAAAAAAAAAAAAAAA

* fixes my shit

* No meming in admin frontend

* Admin Kicks now prompt the admin to avoid accidental kicking
 2018-06-19 14:51:14 -07:00
CitadelStationBot 5f20c052c0 Automatic changelog generation for PR #7183 [ci skip] 2018-06-19 09:40:15 -05:00
LetterJayandGitHub a385f9e76f Merge pull request #7183 from Citadel-Station-13/deathride58-patch-1 
Fixes a merge conflict
 2018-06-19 09:40:11 -05:00
Jordan Brownandletterjay 2cd045b8fe [s] Fixes direct sql datum call exploit. 2018-06-19 09:10:51 -05:00
deathride58andGitHub 7150c207aa Fixes a merge conflict 2018-06-19 07:30:52 -04:00
CitadelStationBot 1438afa013 Automatic changelog generation for PR #7177 [ci skip] 2018-06-18 22:01:44 -05:00
LetterJayandGitHub e448002390 Merge pull request #7177 from Citadel-Station-13/upstream-merge-38555 
[MIRROR] Dsay now shows admin rank instead of ADMIN
 2018-06-18 22:01:42 -05:00
LetterJayandGitHub 861c5cdcc1 Merge pull request #7176 from Citadel-Station-13/upstream-merge-38556 
[MIRROR] Makes a thing use its macro
 2018-06-18 22:01:26 -05:00
CitadelStationBot c9eb0d98d9 Automatic changelog generation for PR #7172 [ci skip] 2018-06-18 22:00:44 -05:00
LetterJayandGitHub 12876c7252 Merge pull request #7172 from Citadel-Station-13/upstream-merge-38553 
[MIRROR] Allow admin ghosts to use .p and .d say prefixes
 2018-06-18 22:00:41 -05:00
CitadelStationBot 4577b9ebbb Automatic changelog generation for PR #7171 [ci skip] 2018-06-18 22:00:15 -05:00
LetterJayandGitHub 7a4aad91cb Merge pull request #7171 from Citadel-Station-13/upstream-merge-38552 
[MIRROR] Fix gulag shuttle moving instantly
 2018-06-18 22:00:13 -05:00
LetterJayandGitHub b7047f0489 Merge pull request #7170 from Citadel-Station-13/upstream-merge-38558 
[MIRROR] Replaces names in plasmaman.txt
 2018-06-18 22:00:00 -05:00
CitadelStationBot 507422de14 Automatic changelog generation for PR #7162 [ci skip] 2018-06-18 21:58:43 -05:00
LetterJayandGitHub 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
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
LetterJayandGitHub c055bfc9d3 Merge pull request #7175 from Citadel-Station-13/upstream-merge-38581 
[MIRROR] Fixes failing tools/dependencies builds succeeding the entire build
 2018-06-18 21:55:48 -05:00
letterjay cc36aa378d Dsay now shows admin rank instead of ADMIN 2018-06-18 19:17:56 -05:00
Jordan Brownandletterjay cf96c7dd11 Dsay now shows admin rank instead of ADMIN (#38555) 
* Dsay now shows admin rank instead of ADMIN

* All caps to protect the dongs of our admemes
 2018-06-18 19:17:55 -05:00
letterjay debe1cd972 Makes a thing use its macro 2018-06-18 19:16:44 -05:00
Jordan Brownandletterjay 99fee78179 Makes a thing use its macro (#38556) 2018-06-18 19:16:43 -05:00
letterjay af414d7d4b Fixes failing tools/dependencies builds succeeding the entire build 2018-06-18 15:27:37 -05:00
Jordan Brownandletterjay aeb047d33f Fixes failing tools/dependencies builds succeeding the entire build (#38581) 2018-06-18 15:27:37 -05:00
CitadelStationBot 8fd79f9912 Automatic changelog generation for PR #7148 [ci skip] 2018-06-18 13:54:01 -05:00
deathride58andkevinz000 aee56b1f3d lets dogborg tongues reduce firestacks when they lick faces (#7148) 2018-06-18 11:53:59 -07:00
CitadelStationBotandkevinz000 db25067491 adds missing /'s at the starts of some obj instances (#7169) 2018-06-18 11:53:33 -07:00
CitadelStationBot 75def268a6 Automatic changelog generation for PR #7165 [ci skip] 2018-06-18 13:53:16 -05:00
CitadelStationBotandkevinz000 7593a2b931 Fixes airless turfs in catgirl containment facility (#7165) 2018-06-18 11:53:14 -07: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
CitadelStationBotandkevinz000 03a22ca16d [MIRROR] Transit space refactor (#7130) 
* Transit space refactor

* Update bitfields.dm
 2018-06-18 11:51:02 -07:00
letterjay 69504f68ce Allow admin ghosts to use .p and .d say prefixes 2018-06-18 13:16:06 -05:00
Jordan Brownandletterjay 684ceb2125 Merge pull request #38553 from AutomaticFrenzy/patch/aghost-saymode 
Allow admin ghosts to use .p and .d say prefixes
 2018-06-18 13:16:06 -05:00
letterjay 57f76091cc Fix gulag shuttle moving instantly 2018-06-18 13:13:35 -05:00
Jordan Brownandletterjay 4ad2dd22ef Merge pull request #38552 from AutomaticFrenzy/patch/labor-shuttle 
Fix gulag shuttle moving instantly
 2018-06-18 13:13:35 -05:00
letterjay ef120f38ea Replaces names in plasmaman.txt 2018-06-18 13:12:21 -05:00
Jordan Brownandletterjay 4a233caf74 Merge pull request #38558 from erwgd/permanentchemnames 
Replaces names in plasmaman.txt
 2018-06-18 13:12:21 -05: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
CitadelStationBot 0cb7361eb8 Automatic changelog generation for PR #7166 [ci skip] 2018-06-18 12:30:29 -05:00
LetterJayandGitHub 81b88d0d85 Merge pull request #7166 from Citadel-Station-13/upstream-merge-38543 
[MIRROR] Fix non-secure windoors not supporting One Required access mode
 2018-06-18 12:30:26 -05:00
CitadelStationBot d1f9716101 Automatic changelog generation for PR #7164 [ci skip] 2018-06-18 12:29:56 -05:00
LetterJayandGitHub 34254116bc Merge pull request #7164 from Citadel-Station-13/upstream-merge-38527 
[MIRROR] Fix ripples appearing too broadly and disappearing too soon
 2018-06-18 12:29:54 -05:00