Commit Graph

33607 Commits

Author SHA1 Message Date
Tom
7f5e3ac103 [Semi-modular] Ports race-specific drinks from oldbase (#3157)
* Ports race-specific drinks from oldbase

* changes a number with catnip tea

* another fix for the tea
2021-02-07 14:11:42 +00:00
SkyratBot
3c84eee13e [MIRROR] Improve ID console name and assignment input (#3173)
* Improve ID console name and assignment input (#56662)

reject_bad_name and reject_bad_text doesn't directly sanitize. It's
best not to rely on this proc to sanitize as that's not the point of
it, even though it can sanitize as part of its functioning. Instead,
we explicitly sanitize the input first, then we reject_bad_whatever
on the sanitized input.

It also offers improved feedback to the user instead of failing
silently, and allows numbers as some of our ID cards (For example,
prisoner IDs) have numbers in their registered_names and assignments.
I don't like creating the game world in a state that players cannot
also replicate themselves.

Also swings by the ancient HTML interfaces to bring them up to the
same standard through either sanitizing input or stripping input as
appropriate.

* Improve ID console name and assignment input

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-02-07 14:09:40 +00:00
SkyratBot
4dba4272c5 [MIRROR] Double definition cleanup on reagents (#3172)
* Double definition cleanup in reagent code (#56678)

Blood and holywater had a on_hydroponics_apply defined twice.

* Double definition cleanup on reagents

Co-authored-by: NightRed <nightred@gmail.com>
2021-02-07 14:09:26 +00:00
SkyratBot
777ede99bf [MIRROR] Toggle suit sensors is now bound to right click (#3168)
* Toggle suit sensors is now bound to right click (#56699)

Right clicking on a jumpsuit will act as if you pressed the "toggle
suit sensors" verb.

This is an extremely common action, and is perfect for right click
behavior. Also people are stripping in the halls right now, forgetting
to shift right click. How embarrassing.

* Toggle suit sensors is now bound to right click

Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
2021-02-07 14:08:13 +00:00
SkyratBot
731a995bcf [MIRROR] Improves Kissing (#3167)
* Improves Kissing (#56698)

Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>

* Improves Kissing

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>
2021-02-07 09:41:24 +00:00
SkyratBot
92c7e2dcbc [MIRROR] Fixes N2O & Healium Euphoria (#3166)
* Fixes N2O & Healium Euphoria (#56673)

N2O and Healium have a simple else statement on the end if there arent enough partial pressure, so you need both to exceed the threshold to get euphoria. This fixes that.

* Fixes N2O & Healium Euphoria

Co-authored-by: vincentiusvin <54709710+vincentiusvin@users.noreply.github.com>
2021-02-07 09:41:09 +00:00
SkyratBot
24c37ff271 [MIRROR] reinforcement nukies and borgs get droppodded (#3164)
* reinforcement nukies and borgs get droppodded (#56682)

reinforcements now get droppodded instead of appearing out of nowhere
fixes contractor drop pods having the wrong icon

* reinforcement nukies and borgs get droppodded

Co-authored-by: Fikou <piotrbryla@onet.pl>
2021-02-07 09:40:41 +00:00
SkyratBot
21d6d62d98 [MIRROR] Fixes CTF runtimes / hard del (#3163)
* Fixes CTF runtimes / hard del (#56681)

* Remove mob from spawned_mobs on qdel

* Clear current mind when brain gets deleted

* Fixes CTF runtimes / hard del

Co-authored-by: Gamer025 <33846895+Gamer025@users.noreply.github.com>
2021-02-07 09:40:29 +00:00
SkyratBot
c4208aadba [MIRROR] fixes maint pill description lacking a period (#3161)
* period! (#56685)

* fixes maint pill description lacking a period

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-02-07 09:40:15 +00:00
SkyratBot
9fa7558654 [MIRROR] Fixes Unstable Mutagen not mutating on exposure (#3162)
* fixes mutagen (#56683)

* Fixes Unstable Mutagen not mutating on exposure

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2021-02-07 09:40:01 +00:00
SkyratBot
cd2eaacf3e [MIRROR] Fixes attacks doing 0 damage when dismemberment wound fails (#3160)
* Fixes attacks doing 0 damage when dismemberment wound fails (#56697)

* Fixes attacks doing 0 damage when dismemberment wound fails

Co-authored-by: YPOQ <30683121+YPOQ@users.noreply.github.com>
2021-02-07 09:39:49 +00:00
Swiftfeather
bb5e7dd054 Fixes a few grammar issues (#3154)
Fixes a few grammar issues sometimes seen by players.
2021-02-07 00:34:36 +00:00
SkyratBot
756af3672f [MIRROR] Fixes a runtime with liquid contents gene (#3156)
* Fixes a runtime with liquid contents gene (#56661)

* Fixes a runtime with liquid contents gene

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2021-02-07 00:34:09 +00:00
SkyratBot
3af100c2f3 [MIRROR] Delete remove_embedded_object.dm (#3149)
* Delete remove_embedded_object.dm (#56675)

File is no longer included in tgstation.dme

* Delete remove_embedded_object.dm

Co-authored-by: Fikou <piotrbryla@onet.pl>
2021-02-06 21:33:36 +00:00
SkyratBot
1c179f0512 [MIRROR] makes all emp_proof cells emp proof (#3148)
* Make all emp_proof cells emp proof (#56677)

For some reason only empty emp proof cells were emp proof. Now all emp proof cells are actually emp proof.

Co-authored-by: Sparkezel <1haslo4@ gmail.com>

* makes all emp_proof cells emp proof

Co-authored-by: Sparkezel <53384660+Sparkezel@users.noreply.github.com>
Co-authored-by: Sparkezel <1haslo4@ gmail.com>
2021-02-06 21:31:29 +00:00
Cheshify
0d712c5cdf Removes Clown and Shadowpeople Transformation (#3151)
Removes the Clown and Shadowpeople transformation from the Anomalous Crystal.
2021-02-06 20:43:32 +00:00
Cameron!
5021730c76 Reverts changes to some traitor items (#3146) 2021-02-06 19:02:21 +00:00
YakumoChen
b9a04aa1ef More stealth descriptions (#3138)
* Update special.dm

* sr edit

* EMP flashlight

* stealthier flash

* syndie health analyzer

* thermals

* grammar
2021-02-06 14:48:52 +00:00
MLGTASTICa
c344beff58 Adds special descs to chameleon items , energy swords(toy and real) , chameleon projector , implanters. (#3136)
* the descs

* Update chameleonproj.dm

* Update dualsaber.dm

* Update implant_misc.dm

* Update energy.dm

* Update toys.dm

* Update toys.dm

* Update chameleon.dm

* Update pen.dm

* grammar

* Update implantuplink.dm

* Update implant_stealth.dm

* Update energy.dm

* Update chameleon.dm

* Update pen.dm

Co-authored-by: MLGTASTICa <ak9bc01d@yahoo.com>
2021-02-06 14:46:43 +00:00
SkyratBot
40886712c7 [MIRROR] amputation shears now check for incapatation instead of specifically the stunned status effect (#3144)
* Change shears to check for incapacitation instead of stunned status effect (#56674)

Amputation shears now check for incapacitation instead of specifically
the stunned status effect to determine if you can get a 0.5x multiplier
for the time required to cut off a patient's limb despite the patient
not being unconscious, critted, or dead. This means that
staminacritting and paralysis can now count for this check.

In addition, the 1.5x time multiplier for the patient/victim being
jittery is now no longer mutually exclusive with the above 0.5x
multiplier (previously, the 0.5x multiplier would take priority).
Note that this penalty does not apply if the patient is dead, as
having a nonzero jitteriness variable only causes a jittering
animation if you're not dead.

* amputation shears now check for incapatation instead of specifically the stunned status effect

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
2021-02-06 14:31:24 +00:00
SkyratBot
35c031d618 [MIRROR] removes "null" (#3143)
* Remove string from snow golem species colour (#56664)

Instead of trying to use the string `"null"` as a colour, we just
use `null` to indicate the absence of species colour for snow golems.

* removes "null"

Co-authored-by: Fikou <piotrbryla@onet.pl>
2021-02-06 14:30:23 +00:00
SkyratBot
7bd3d98f50 [MIRROR] Updated the Nanite Dermal Button icon set (#3142)
* Update the Nanite Dermal Button icon set (#56588)

The PR replaces the standard set of Nanite icons (number, plus, minus,
power) in different colors with an extended set of icons in a single
color.

The current icon set is very limited, the numbers don't provide much
context and some colors are barely visible on certain UI backgrounds
(yellow in particular).

The new set has bigger variety of icons, but removes the color
selection option to improve icon visibility.

* Updated the Nanite Dermal Button icon set

Co-authored-by: Andrew <mt.forspam@gmail.com>
2021-02-06 14:30:15 +00:00
SkyratBot
3ebec87968 [MIRROR] Small fix for reset_pull_offsets() (that you probably won't even notice) (#3139)
* Small fix for reset_pull_offsets() (that you probably won't even notice) (#56671)

* Small fix for reset_pull_offsets() (that you probably won't even notice)

Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
2021-02-06 14:29:59 +00:00
SkyratBot
c496fc41ab [MIRROR] Various crew tracking fixes (#3137)
* Various crew tracking fixes (#56591)

Nanite Monitoring program now makes people trackable as if they have enabled their suit sensors, as stated in the program description.

Now you can track people with Nanites Monitoring program using following devices:

    Crew pinpointer (arrow)
    Crew pinpointer - contractor version (arrow)
    Crew pinpointer (proximity)
    Lifeline radar (modular computers software)

Also fixed multi-Z tracking for the first three devices. When the target is on different Z of the same station, it shows "?" icon.

Also, the stationary crew monitor will now work properly on multi-Z stations.

* Various crew tracking fixes

Co-authored-by: Andrew <mt.forspam@gmail.com>
2021-02-06 14:27:21 +00:00
Gandalf
4d6bfd4355 Misc bug fixes #1 (#3135)
* safety updatesa

* multiple bugfixes

* Update synth_emotes.dm

* Update synth_emotes.dm
2021-02-06 14:27:11 +00:00
SkyratBot
7acbd68644 [MIRROR] Add alternate attack procs (#3134)
* Add alternate attack procs (#56663)

Adds alternate attack procs for right-clicking. Updates the gunpoint code to use this new proc as an example (though I suspect this is being changed soon, so oops).

This makes it easier to add new behavior to right click, which we should be doing.

* Add alternate attack procs

Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
2021-02-06 00:50:15 +00:00
SkyratBot
8bc898f14a [MIRROR] You can no longer shoot and melee with guns at the same time (#3133)
* You can no longer shoot and melee with guns at the same time (#56647)

* You can no longer shoot and melee with guns at the same time

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2021-02-06 00:10:42 +00:00
SkyratBot
334092ed5e [MIRROR] Energy katana now uses right click to teleport instead of toggling (#3131)
* Energy katana now uses right click to teleport instead of toggling (#56636)

Energy katana now uses right click to teleport instead of toggling by activating in hand.
Right click is the new standard for minor interactions. This feels much more fluid than switching, and ensures you'll never mess it up.
Right clicking being the new method of minor interactions starts now.

* Energy katana now uses right click to teleport instead of toggling

Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
2021-02-05 23:17:27 +00:00
SkyratBot
f0b9f436aa [MIRROR] removes an unused variable from lungs.dm 2 (#3126)
* hexane gone (#56665)

hexane is dead, why are we keeping an unused var?

* removes an unused variable from lungs.dm 2

Co-authored-by: TJatPBnJ <69724863+TJatPBnJ@users.noreply.github.com>
2021-02-05 22:57:03 +00:00
SkyratBot
2013fdbbe9 [MIRROR] Makes borg organ bags into an apparatus (#3106)
* Makes borg organ bags into an apparatus

* Update robot_modules.dm

* Update highlander.dm

* Update highlander.dm

* Update robot_modules.dm

* Update robot_modules.dm

* Merge branch 'master' into upstream-merge-56401

Co-authored-by: dragomagol <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 22:21:36 +00:00
Gandalf
0c324afce7 Special Examine System (#2974)
* Version 1

* fixes

* You know, the detective deserves love!

* system dumb

* DUMBO

* Detective trait

* Update examine_more.dm

* Update examine_more.dm

* Merge branch 'master' into examinemore
2021-02-05 22:14:14 +00:00
SkyratBot
699cd1e412 [MIRROR] renames metal sheets to iron sheets (#3116)
* renames metal sheets to iron sheets

* Merge branch 'master' into upstream-merge-56643

* yay metal

* Update DeltaStation2_skyrat.dmm

* a

* Update CentCom_skyrat_z2.dmm

* a

* a

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 22:09:50 +00:00
SkyratBot
c179c2bf59 [MIRROR] You no longer need to hold shift to open the context menu as a ghost (#3122)
* You no longer need to hold shift to open the context menu as a ghost (#56646)

* You no longer need to hold shift to open the context menu as a ghost

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2021-02-05 22:06:57 +00:00
SkyratBot
23da06b23b [MIRROR] Remove adrenal implant and associated reagent (#3121)
* Remove adrenal implant and associated reagent (#56649)

* Remove adrenal implant and associated reagent

Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com>
2021-02-05 22:06:32 +00:00
SkyratBot
a71db470d8 [MIRROR] makes blast cannons not seem like an innocent item before a bomb is loaded (#3120)
* makes blast cannons not seem like an innocent item before a bomb is loaded (#56645)

* makes blast cannons not seem like an innocent item before a bomb is loaded

Co-authored-by: Fikou <piotrbryla@onet.pl>
2021-02-05 22:06:05 +00:00
SkyratBot
40552eac24 [MIRROR] Fixed NTOS File Manager renaming and deletion (#3119)
* Fixed NTOS File Manager renaming and deletion (#56613)

* Fixed NTOS File Manager renaming and deletion

Co-authored-by: Andrew <mt.forspam@gmail.com>
2021-02-05 22:05:57 +00:00
SkyratBot
95ce852fad [MIRROR] Tend wound fix and minor refactor. (#3117)
* Tend wound fix and minor refactor. (#56599)

* fixes tend wounds healing damage that wasnt specified by it.

fixes the tend wounds that should heal one damage you choose i.e.: burn randomly heal some brute while not healing burn or heal burn and brute at the same time.

* Tend wound fix and minor refactor.

Co-authored-by: manofpepsi <71612753+manofpepsi@users.noreply.github.com>
2021-02-05 22:05:20 +00:00
SkyratBot
a23d354920 [MIRROR] fixes galoshes description (#3111)
* galoshes fix (#56639)

* fixes galoshes description

Co-authored-by: Fikou <piotrbryla@onet.pl>
2021-02-05 21:43:09 +00:00
SkyratBot
18d9daadb1 [MIRROR] Improves friendly commendation code (#3110)
* Improves friendly commendation code (#56453)

* Improves friendly commendation code

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-02-05 21:42:47 +00:00
SkyratBot
25df6e7da3 Cleaning up robot code: modules renamed to models & DOGBORG REWORK (#2837)
* Cleaning up robot code: modules renamed to models

* Merge branch 'master' into upstream-merge-56312

* [PR Fix] Modular_Skyrat borgos (#3019)

* No more linter complaining

* Halfway (or full way, I don't know) through moving stuff around

* Caps!

* a

Co-authored-by: dragomagol <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-02-05 21:28:06 +00:00
SkyratBot
223499cbb9 [MIRROR] hauntium is now properly applied to the photo. (#3105)
* hauntium is now properly applied to the photo (#56615)

* hauntium is now properly applied to the photo.

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2021-02-05 21:25:16 +00:00
SkyratBot
3c37bdc8e5 [MIRROR] disables godmode for some vendors and adds missing refills (#3103)
* disables godmode for some vendors and adds missing refills (#56570)

* disables godmode for some vendors and adds missing refills

Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
2021-02-05 21:24:37 +00:00
SkyratBot
43c6850b31 [MIRROR] Makes reinforced plasma windows block heatspreading (#3101)
* Makes reinforced plasma windows block heatspreading, mostly so the sm delams properly, and partially so mappers have a tool for this sort of thing (#56545)

* Makes reinforced plasma windows block heatspreading

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-02-05 21:24:11 +00:00
SkyratBot
ffd03f617a [MIRROR] Fixes gorillification for radiated monkeys (#3098)
* Fixes gorillification for radiated monkeys

* a

Co-authored-by: Couls <coul422@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 21:22:25 +00:00
SkyratBot
b5f101661d [MIRROR] You can now remove embedded objects directly with a hemostat (#3097)
* You can now remove embedded objects directly with a hemostat (#56637)

* You can now remove embedded objects directly with a hemostat

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-02-05 21:19:35 +00:00
Swiftfeather
1a41dd9f4c Removes capital X KSS from forked tongues (#3096)
Removes the capital X going to KSS from the forked tongue hiss, this allows lizards and other people who have taken the forked tongue to say things like RDX instead of RDKSS, and overall improves readability. This does not affect lowercase x's.
2021-02-05 21:19:03 +00:00
SkyratBot
389b366c84 [MIRROR] Unit tests harvesting plants from hydroponics trays (#3093)
* Unit tests harvesting plants from hydroponics trays (#56335)

* Unit tests harvesting plants from hydroponics trays

* Merge branch 'master' into upstream-merge-56335

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 21:17:59 +00:00
SkyratBot
e124662031 [MIRROR] A Big Hydroponics Update: A Rose by any other name (2 new plants, 4 new traits, new genes, and more!) (#3089)
* A Big Hydroponics Update: A Rose by any other name (2 new plants, 4 new traits, new genes, and more!)

* Update grafts.dm

* Update grafts.dm

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 21:13:02 +00:00
SkyratBot
dd4a146f90 removes the test-merge only code from the combat mode commit (#3064)
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 21:05:21 +00:00
SkyratBot
71d7f965cc [MIRROR] Heretic void cloak no longer deletes itself when you unequip it. (#3112)
* Heretic void cloak no longer deletes itself when you unequip it. (#56619)

* Heretic void cloak no longer deletes itself when you unequip it.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-02-05 17:29:35 +00:00