Commit Graph

12533 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
a3a4ecffbe Update components.dm 2018-06-24 15:08:37 -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
CitrusGender
d50ae43d7f Fixed cyborgs not getting their names at round start 2018-06-24 13:55:03 -05:00
Jordan Brown
f1684aab2f Merge pull request #38684 from AutomaticFrenzy/patch/goonchat-logs
Allow actually saving Goonchat logs
2018-06-24 09:44:31 -05:00
Jordan Brown
11dc633021 Merge pull request #38692 from Jordie0608/blacklistedmakesitsoundlikethebuilddidsomethingbadwhichitdidbadbuildnaughtybuild
Blacklisted buggy build 1428
2018-06-24 09:16:39 -05:00
Jordan Brown
20cb09cb1c Fixes bubblegum comments 2018-06-24 05:17:22 -05:00
Jordan Brown
a73bfd0913 Ports more things to Initialize (#38653) 2018-06-24 05:17:15 -05:00
Time-Green
1a53b59b12 Fixes closed soda cans transferring (#38668) 2018-06-24 05:17:00 -05:00
kevinz000
4ffe025624 Cyborgs now drop radio keys on detonation/destruction (#38617)
* Cyborgs now drop radio keys on detonation/destruction

* Woops!

* Update robot.dm

* Use atom rather than turf
2018-06-24 05:16:18 -05:00
AnturK
843c05aa82 Fixes antag logs (#38658)
* Fixes roundstart antag logging.

* Fixes roundend antag logging.

* Handles blown up minds.

* whoops

* total antag cleanup
2018-06-24 05:16:06 -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
Jordan Brown
6e94511718 Removes unused defines (#38650) 2018-06-22 02:04:45 -05:00
KorPhaeron
fa06a729a2 Bubblegum is scarier again (#38306)
Miners are able to kill him roundstart by just walking backwards while shooting. Weaker than an ash drake.

Easiest way to change this was to give him his original attacks back which required you to avoid/manage blood.
2018-06-21 18:56:28 -05:00
Tlaltecuhtli
01eb1bc7fe [READY] better contraband crates (#38321)
feature: NT reports that the local contraband market has expanded, experts say that the Syndicate is involved.
2018-06-21 18:52:15 -05:00
kevinz000
561c2179f8 Fixes and adds blast cannons to traitor science uplink items (#38093)
rscadd: Blast cannons have been fixed and are now available for purchase by traitorous scientists for a low low price of 14TC.
rscadd: Blast cannons take the explosive power of a TTV bomb and ejects a linear projectile that will apply what the bomb would do to a certain tile at that distance to that tile. However, this will not cause breaches, or gib mobs, unless the gods (admins) so will it.
experimental: Blast cannons do not respect maxcap. (Unless the admins so will it.)
2018-06-21 18:38:46 -05:00
Jordan Brown
4e89973d0b Merge pull request #38637 from DaxDupont/create-antag
Makes create antags check for on station.
2018-06-21 18:19:13 -05:00
Jordan Brown
16bd86e4cb Merge pull request #38633 from ExcessiveUseOfCobblestone/patch-46
potency gene disks now clarify what the % means on examine
2018-06-21 16:54:20 -05:00
YPOQ
a6cfd22b79 Fixes gulag stacker not giving points after RPG loot event (#38570)
* Fixes gulag stacker not giving points after RPG loot event

* Moves point values to type vars

* cleanup
2018-06-21 16:30:39 -05: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
Jordan Brown
c11557d23d Global component signals 2018-06-19 17:18:34 -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
kevinz000
a4a27204ae Update robot.dm 2018-06-19 14:46:26 -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
Jordan Brown
2cd16aa1ad Fix some shuttle chair stuff (#38557)
* Fix shuttle chair stuff

* Remove redundancy
2018-06-19 01:29:17 -05: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