shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,774 Commits 5 Branches 0 Tags
8f7ca9fbbaba897ef9bb504e53c8fbbcfea629e7
Commit Graph

11102 Commits

Author SHA1 Message Date
LetterJay
8f7ca9fbba Merge pull request #7211 from Citadel-Station-13/upstream-merge-38534 
[MIRROR] Fixes AI's being unable to call shuttle using comm console.
 2018-06-24 15:16:09 -05:00
LetterJay
7e84223efd Merge pull request #7202 from Citadel-Station-13/upstream-merge-38605 
[MIRROR] Micro-optimization to update_corners()
 2018-06-24 15:12:05 -05:00
LetterJay
701f2fde31 Merge pull request #7201 from Citadel-Station-13/upstream-merge-38153 
[MIRROR] Equalizes Roundstart Mining Options (Removes some Advanced Scanners and Explorer Webbings)
 2018-06-24 15:11:41 -05:00
LetterJay
922e2a4515 Merge pull request #7200 from Citadel-Station-13/upstream-merge-38584 
[MIRROR] Adds /datum/DBQuery/proc/SetQuery
 2018-06-24 15:11:23 -05:00
LetterJay
ce9d797ac5 Merge pull request #7190 from Citadel-Station-13/upstream-merge-38577 
[MIRROR] PDA can be ctrl-clicked to remove the item in its pen slot
 2018-06-24 15:07:54 -05:00
LetterJay
ecbe355b4b Merge pull request #7189 from Citadel-Station-13/upstream-merge-38580 
[MIRROR] Adds a pink scarf
 2018-06-24 15:07:34 -05:00
LetterJay
06c7cebb82 Merge pull request #7188 from Citadel-Station-13/upstream-merge-38319 
[MIRROR] [READY] Helps data disks stop being unemployed
 2018-06-24 15:07:14 -05:00
LetterJay
fc3ed3716d Merge pull request #7187 from Citadel-Station-13/upstream-merge-38576 
[MIRROR] Fixes alternative method of removing legcuffs.
 2018-06-24 15:06:21 -05:00
LetterJay
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
LetterJay
6685bfcc8b Update dbcore.dm 2018-06-24 15:04:24 -05:00
CitadelStationBot
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
CitadelStationBot
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
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
CitadelStationBot
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
AnturK
5e156e7a07 Fixes AI's being unable to call shuttle using comm console. (#38534) 
* Fixes AI's being unable to call shuttle using comm console.

* Lets get rid of double negatives

* viewvers for
 2018-06-20 19:39:17 -05:00
CitadelStationBot
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
Jordan Brown
05995f5774 Merge pull request #38605 from vuonojenmustaturska/tinylight 
Micro-optimization to update_corners()
 2018-06-20 09:25:18 -05:00
Grandmother of 50
2fefc185d3 Equalizes Roundstart Mining Options (Removes some Advanced Scanners and Explorer Webbings) (#38153) 2018-06-20 02:43:42 -05:00
Jordan Brown
fcfdf968d1 Adds /datum/DBQuery/proc/SetQuery (#38584) 
* Adds /datum/DBQuery/proc/SetQuery

* Needful newness
 2018-06-20 02:18:53 -05:00
CitadelStationBot
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
Irafas
75335cb30b PDA can be ctrl-clicked to remove the item in its pen slot (#38577) 
* Makes pens ez to remove from pda

Players can now ctrl click on the PDA to remove the pen without having to remove the ID first.

* added instructions when examined.

Like how it tells the user they can use alt-click to remove contents, it now says they can use ctrl-click to remove items from the pen slot.

* PDA can now be dragged without dropping the pen.

When ctrl-clicked it now checks to see if the PDA is on a turf and will only output the pen if its not.

* quick change to examine text.

* comma

* Improved the examine
 2018-06-19 09:49:36 -05:00
Jordan Brown
1ee84bb7d2 Merge pull request #38580 from Hyacinth-OR/pinkscarf 
Adds a pink scarf
 2018-06-19 09:49:28 -05:00
JStheguy
02744c59a5 [READY] Helps data disks stop being unemployed (#38319) 
* data cards actually have a function now

* Adds data cards to the IC printer for real rea

* more cards, less shitty code

* how the fuck did I miss that

adds a missing ..()

* wait wrong use of ..() fuck
 2018-06-19 09:23:33 -05:00
Jordan Brown
8115f0acda Merge pull request #38576 from AnturK/runtimeL 
Fixes alternative method of removing legcuffs.
 2018-06-19 09:19:15 -05:00
Jordan Brown
2cd045b8fe [s] Fixes direct sql datum call exploit. 2018-06-19 09:10:51 -05:00
deathride58
7150c207aa Fixes a merge conflict 2018-06-19 07:30:52 -04:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
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
Jordan Brown
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
Jordan Brown
99fee78179 Makes a thing use its macro (#38556) 2018-06-18 19:16:43 -05:00
CitadelStationBot
db25067491 adds missing /'s at the starts of some obj instances (#7169) 2018-06-18 11:53:33 -07:00
CitadelStationBot
03a22ca16d [MIRROR] Transit space refactor (#7130) 
* Transit space refactor

* Update bitfields.dm
 2018-06-18 11:51:02 -07:00
Jordan Brown
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
Jordan Brown
4ad2dd22ef Merge pull request #38552 from AutomaticFrenzy/patch/labor-shuttle 
Fix gulag shuttle moving instantly
 2018-06-18 13:13:35 -05:00
LetterJay
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
LetterJay
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
LetterJay
fb53413ded Merge pull request #7160 from Citadel-Station-13/upstream-merge-38270 
[MIRROR] [READY] advanced foam extinguisers [READY]
 2018-06-18 12:28:42 -05:00
LetterJay
119fb6abf6 Merge pull request #7159 from Citadel-Station-13/upstream-merge-38542 
[MIRROR] Some minor cleanup to RegisterSignal
 2018-06-18 12:28:11 -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
29ae18fb1a Merge pull request #7157 from Citadel-Station-13/upstream-merge-38461 
[MIRROR] Fixes the Blob being banished to the shadow realm
 2018-06-18 12:23:03 -05:00
LetterJay
62490e07a8 Merge pull request #7154 from Citadel-Station-13/upstream-merge-38551 
[MIRROR] Fix item fortification scrolls stacking
 2018-06-18 12:18:30 -05:00
LetterJay
d42c0d42de Merge pull request #7153 from Citadel-Station-13/upstream-merge-38550 
[MIRROR] Fix repairing Cyborg headlamp even when its panel is closed
 2018-06-18 10:13:05 -05:00
LetterJay
75f0dfcf35 Merge pull request #7146 from deathride58/loocdudewtf 
Prevents the vast majority of IC in LOOC cases
 2018-06-18 10:11:48 -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
c58dbc1110 Merge pull request #7138 from Citadel-Station-13/upstream-merge-38476 
[MIRROR] [s] Fix launchpads creating way too many sparks
 2018-06-18 10:09:42 -05:00
LetterJay
c40a2e698d Merge pull request #7137 from Citadel-Station-13/upstream-merge-38496 
[MIRROR] Fix being able to pull mirage borders, others
 2018-06-18 10:09:20 -05:00