Commit Graph

14385 Commits

Author SHA1 Message Date
Gandalf
708c5e42e9 ACTUALLY make latejoin prisoners start in the prison :/ (#5160)
* this time they won't spawn in brazil

* Update prisoner.dm

* 0

* aaaa
2021-04-24 19:01:00 +01:00
FlamingLily
210c09cf6e Update belt.dm (#5159) 2021-04-24 18:20:39 +01:00
SkyratBot
16cc1c4a1e [MIRROR] Fixes ?. nonsense. (#5152)
* Fixes ?. nonsense. (#58630)

Co-authored-by: Fikou <piotrbryla@ onet.pl>

* Fixes ?. nonsense.

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: Fikou <piotrbryla@ onet.pl>
2021-04-24 13:54:25 +01:00
SkyratBot
3d97efcce6 [MIRROR] Fixes full unrestrained interaction while buckled to a xeno nest. (#5144)
* Fixes full unrestrained interaction while buckled to a xeno nest. (#58617)

* Fixes full unrestrained interaction while buckled to a xeno nest.

Co-authored-by: Seth Scherer <supernovaa41@protonmail.com>
2021-04-24 01:27:08 +01:00
SkyratBot
886e4b56d3 [MIRROR] Mexican Food Tab, Food Tagging Tweaks (#5141)
* Mexican Food Tab, Food Tagging Tweaks (#58622)

* Tagging Fixes, Food Moves

Fixes Food Tags on a bunch of burritos. (3/4 don't use MEAT. They were tagged with MEAT.)
Fixes Food Tag and renames Egg Wrap (It doesn't use Tortillas. No GRAIN)
Moves Scotch Egg and Egg Wrap to EGG foods.

Makes a Mexican Food Tab, and moves burritos, tacos, and nachos into it.

* Mexican Food Tab, Food Tagging Tweaks

Co-authored-by: Winter Flare <7543955+Owai-Seek@users.noreply.github.com>
2021-04-24 00:41:35 +01:00
SkyratBot
2d4b83f6d4 [MIRROR] Dummies equipping outfits no longer call equipped (#5140)
* Dummies equipping outfits no longer call equipped (#58597)

* Dummies equipping outfits no longer call equipped

Co-authored-by: Trigg <36010999+TriggeredBoi@users.noreply.github.com>
2021-04-24 00:22:56 +01:00
SkyratBot
b826379ef8 [MIRROR] Changes reinforced window deconstruction to right click (#5114)
* Changes reinforced window deconstruction to right click

* Update weldingtool.dm

Co-authored-by: dragomagol <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-23 22:14:08 +01:00
FlamingLily
6dc2a67768 Disables the electrical welder and brings back OG e-welder, pending fixes. (#5045)
* Update tool_designs.dm

* Update electric_welder.dm

* Update belt.dm

* fuck
2021-04-23 21:49:37 +01:00
SkyratBot
9e19dc298a [MIRROR] nitrile gloves buff (#5098)
* nitrile gloves buff (#58594)

* nitrile gloves buff

Co-authored-by: manofpepsi <71612753+manofpepsi@users.noreply.github.com>
2021-04-23 21:46:37 +01:00
BluBerry016
623efa69d7 AAAAAA (#5014) 2021-04-23 21:45:50 +01:00
Winter Flare
e4160263a6 Makes Gear Harness craftable. Adds Loincloth to Dorm Vend. (#5103)
* Dorm Vend Tweaks

Adds Dorm Vendor Repack to Cargo
Adds Loincloth to Vendor
Adds Gear Harness to Leather Crafting

* Fixed Sheetcrafting
2021-04-23 21:45:29 +01:00
SkyratBot
7770901227 [MIRROR] Fixes a bunch of invalid icon states (#5126)
* Fixes a bunch of invalid icon states. There's more, but my brain isn't fried enough for that. (#58608)

gibup1 and gibdown1 don't exist
items_and_weapons.dmi doesn't have an icon state called his_grace_ascended, in fact nothing does
items_cyborg.dmi doesn't have an icon state called laser, it  does however have an icon state called
laser_cyborg
no porta_turret has an icon state with the _unpowered suffix, in fact I'm convinced none of them ever have

* Fixes a bunch of invalid icon states

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-04-23 13:50:26 +01:00
SkyratBot
a88004c4f6 [MIRROR] Allows you to repair trophy cases (the ones found in the library) (#5107)
* Allows you to repair trophy cases (the ones found in the library) (#58588)

Apparently you haven't been able to repair these for the last four years.
Fixes #27926 (Trophy cases being perma broken)

All other display cases can be repaired, why shouldnt this one be able to.

* Allows you to repair trophy cases (the ones found in the library)

Co-authored-by: Seth Scherer <supernovaa41@protonmail.com>
2021-04-23 13:47:04 +01:00
SkyratBot
8f2801ce64 [MIRROR] Tank holders can be anchored and have better examine descriptions. (#5094)
* Tank holders can be anchored and have better examine descriptions. (#58348)

* Tank holders can be anchored

* Better description

* One word

* Requested change

* Tank holders can be anchored and have better examine descriptions.

Co-authored-by: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com>
2021-04-22 20:11:30 +01:00
SkyratBot
336c6524c8 [MIRROR] Fixes painted directional window opacity bug (#5082)
* Prevents jank directional window opacity bugs (#58577)

* Fixes painted directional window opacity bug

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
2021-04-22 05:09:39 +01:00
SkyratBot
c961925acc [MIRROR] Exorcises shitcode demons out of an unobtainable piece of farm equipment (#5069)
* Exorcises shitcode demons out of an unobtainable piece of farm equipment (#58568)

* Removes code that does nothing

* Adds comments

Co-authored-by: Your mother <mothmilk666666666666@ tfwno.gf>

* Exorcises shitcode demons out of an unobtainable piece of farm equipment

Co-authored-by: interestingusernam3 <51925758+interestingusernam3@users.noreply.github.com>
Co-authored-by: Your mother <mothmilk666666666666@ tfwno.gf>
2021-04-21 18:33:57 +01:00
SkyratBot
0f4938bf5c [MIRROR] Adds comments to handcuffs.dm (#5067)
* Adds comments to handcuffs.dm (#58478)

* update

* Adding changes made to file in #58456

* Comments handcuffs in handcuffs.dm

* Comments for legcuffs stuff

* Final touches

* Adds two newlines that make the code a bit prettier

* Changed handcuff subtype comments

Mostly removing useless extended descriptions from cablecuff subtypes

* Alien handcuffs comment now actually states what they are

* IT'S BLAND YOU SAY?

* Removes bloat

Co-authored-by: BuildTools <unconfigured@ null.spigotmc.org>
Co-authored-by: MothMilk666 <mothmilk666666666666@ tfwno.gf>

* Adds comments to handcuffs.dm

Co-authored-by: interestingusernam3 <51925758+interestingusernam3@users.noreply.github.com>
Co-authored-by: BuildTools <unconfigured@ null.spigotmc.org>
Co-authored-by: MothMilk666 <mothmilk666666666666@ tfwno.gf>
2021-04-21 18:33:47 +01:00
SkyratBot
d5bf2b0b4e [MIRROR] Converts screwdrivers to GAS (#5058)
* Converts screwdrivers to GAS (#58453)

* Basic GAS setup

* Compile fix

* Fixes, inhands, belt icons

* New procs

* New version of GAGS

* Inhand for subtypes

* Typo fix

* Converts screwdrivers to GAS

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
2021-04-21 05:53:17 +01:00
SkyratBot
68d376d367 [MIRROR] Fixes some typos in frozen.dm descriptions (#5056)
* Fixes some typos in frozen.dm descriptions (#58539)

* Fixes some typos in frozen.dm descriptions

Co-authored-by: Swept <sweptwastaken@protonmail.com>
2021-04-21 04:08:37 +01:00
SkyratBot
d0510f16c8 [MIRROR] Reverse bear trap resprite (#5042)
* Reverse bear trap resprite (#58411)

imageadd: added new icons for reverse bear trap

* Reverse bear trap resprite

Co-authored-by: Greniza <61635418+Greniza@users.noreply.github.com>
2021-04-20 16:29:14 +01:00
SkyratBot
26f7af3e1a [MIRROR] Fixes chicken and exotic meats not processing into meatballs. (#5035)
* Fixes chicken and exotic meats not processing into meatballs (#58509)

* Fixes chicken and exotic meats not processing into meatballs.

Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
2021-04-20 05:04:38 +01:00
OrionTheFox
344f11b9c6 FIX FOR Eyepatch Left/Right Toggle! (#4949) (#5001)
* toggleable eyepatch side

the day we've been waiting for.,

* HAHAHAHHA WHOOPS

I FORGOT A CHECK TO MAKE SURE THAT ALL EYEWEAR SPRITES DIDNT TRY TO ADD _R TO THE END
2021-04-20 01:29:32 +01:00
SkyratBot
16112497c8 [MIRROR] Completely removes unused caution sign from code (#5026)
* Completely removes unused caution sign from code (#58532)

Tiny atomic pr that zaps the old unused caution sign out of both its icon file, the code, that one random map file it was still in, metastation, and rearranged metastation. You can now properly wear caution signs from all sources!

* Completely removes unused caution sign from code

* removes obj/item/caution

Co-authored-by: Kokonut <38844529+maxymax13@users.noreply.github.com>
Co-authored-by: KathrinBailey <evesovereign@hotmail.co.uk>
2021-04-19 21:58:26 +01:00
Gandalf
553b707ba3 aaa (#5016) 2021-04-18 21:31:42 +01:00
Gandalf
abfb646aa2 Removes assaultops (#4952)
* aAAA

* aaa
2021-04-18 20:47:10 +02:00
SkyratBot
6c8b4ddcd4 [MIRROR] Scrolling layers for RPD is more snappy. It is also no longer flipped. (#4995)
* Scrolling layers for RPD is more snappy. It is also no longer flipped. (#58493)

* Scrolling layers for RPD is more snappy. It is also no longer flipped.

Co-authored-by: vincentiusvin <54709710+vincentiusvin@users.noreply.github.com>
2021-04-18 14:27:48 +01:00
Gandalf
6b8a912840 Item use power and cell component refactor (#4900)
* aaaaaaa

* Update cell_component.dm

* Update cell_component.dm

* Update cell_component.dm

* aaaaa

* aaaaaaaaaaaaaaaaaaaaa

* Update flashlight.dm

* Update flashlight.dm

* aaaaaaaaaaaaaaaaaaaaaaaaaaaa

* AAAAAAAAAA

* Update _wires.dm

* aaaa

* AAAAAAAAAAAAAAAAA

* aaa

* Update cell_component.dm

* aaaa

* AAAAAAAAAAAAAAA

* AAAAAAAAAA

* AAAAAAAA

* Update youtool.dm

* aaaaaaaa

* aaaa

* aaaa

* asaa

* HOLY FUCK YOU GUYS ARE ALL SO LAZY JESUS FUCKING CHRIST

* aaaaa

* Update cell_component.dm

* Update cell_component.dm

* Update cell_component.dm

* Update cell_component.dm

* Update cell_component.dm

* Update traitordevices.dm

* aaa

* Update traitordevices.dm

* Update traitordevices.dm

* aaa

* Update cell_component.dm

* POWER CELLS VERSION 2

* OH YEAH BABY

* A

* Update cell_component.dm

* Update flashlight.dm

* AAAAAA

* Update flashlight.dm

* Update atoms.dm

* aa

* AAAAAAAAAAAAA

* aa

* Update multi_cell_charger.dm

* Update flashlight.dm

* Update flashlight.dm

* Update multi_cell_charger.dm

* aaa

* Update _wires.dm

* Update electric_welder.dm

* aaaaa

* Update tools.dmi
2021-04-18 15:09:13 +02:00
Cheshify
c18a157715 [NONMODULAR] Head Of Security Nerf/Fix (#4972)
* HoS Nerf

* Typo Fix

* aaa

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-17 21:43:13 +01:00
Gandalf
9decfc49f6 Revert "toggleable eyepatch side (#4949)" (#4986)
This reverts commit 774824da18.
2021-04-17 19:45:43 +01:00
SkyratBot
129f09b657 [MIRROR] Hollowpoints and similar attacks/weapons double existing armor, not add total armor, to the their targets (#4984)
* Hollowpoints and similar attacks/weapons double existing armor, not add total armor, to the their targets (#58114)

* Hollowpoints and similar attacks/weapons double existing armor, not add total armor, to the their targets

* a

* Update tools.dmi

* Update tools.dmi

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-17 17:18:04 +01:00
OrionTheFox
774824da18 toggleable eyepatch side (#4949)
the day we've been waiting for.,
2021-04-17 16:01:42 +01:00
Gandalf
b40d89db02 Security boot crunch (#4967)
* aaa

* Update miscellaneous.dm

* aaaa
2021-04-17 15:50:12 +01:00
SkyratBot
0618a7d95e [MIRROR] Minor code readability improvement to default values of the breakouttime var (#4982)
* Minor code readability improvement to default values of the breakouttime var (#58456)

Replaces time expressed in deciseconds with time expressed in deciseconds but with use of the MINUTES and SECONDS defines for readability.

* Minor code readability improvement to default values of the breakouttime var

Co-authored-by: interestingusernam3 <51925758+interestingusernam3@users.noreply.github.com>
2021-04-17 15:45:57 +01:00
SkyratBot
c59647463a [MIRROR] Carved statue rotation bug fix (#4975)
* Allows rotating statues (#58462)

* Carved statue rotation bug fix

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
2021-04-17 14:03:13 +01:00
SkyratBot
fa8e5628e6 [MIRROR] Move eyestabbing to an element, rather than as part of core combat code (#4964)
* Move eyestabbing to an element, rather than as part of core combat code

* Update item_attack.dm

* Update item_attack.dm

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-17 01:57:45 +01:00
SkyratBot
3ef3c1193c [MIRROR] Adds worn overlay y offset variable. (#4930)
* Adds worn overlay y offset variable. (#58400)

Co-authored-by: Krysonism <49783092+Krysonism@ users.noreply.github.com>

* Adds worn overlay y offset variable.

* Update human_update_icons.dm

* Update human_update_icons.dm

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: Krysonism <49783092+Krysonism@ users.noreply.github.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
2021-04-16 13:26:07 +02:00
SkyratBot
1f0092aa3a [MIRROR] Removes the slur from a possible smoke bomb description (#4936)
* Removes the slur from a possible smoke bomb description (#58360)

* Removes the slur from a possible smoke bomb description

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
2021-04-16 00:55:50 +01:00
SkyratBot
665d46688c [MIRROR] Insulating gloves gives chunky fingers trait (#4931)
* Insulating gloves gives chunky fingers trait (#58407)

* Insulating gloves gives chunky fingers trait

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-04-15 19:58:56 +01:00
SkyratBot
1fa8f89cd1 [MIRROR] Converts wirecutters to GAS (#4927)
* Converts wirecutters to GAS (#58307)

* New wirecutters Greyscale

* New procs use

* Converts wirecutters to GAS

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-15 17:13:49 +01:00
SkyratBot
70dad5462d [MIRROR] REOPEN: REVERT: Changes faster fireman carrying from a trait on gloves to a skillchip (#4925)
* REOPEN: REVERT: Changes faster fireman carrying from a trait on gloves to a skillchip (#58268)

Co-authored-by: SuperNovaa41 <supernovaa41@ protonmail.com>

* REOPEN: REVERT: Changes faster fireman carrying from a trait on gloves to a skillchip

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: SuperNovaa41 <supernovaa41@ protonmail.com>
2021-04-15 16:23:00 +01:00
SkyratBot
01f0f85c9f [MIRROR] The Hangover station trait no longer makes you drop your held items into the shadow realm on roundstart. (#4920)
* The Hangover station trait no longer makes you drop your held items into the shadow realm on roundstart. (#58331)

* The Hangover station trait no longer makes you drop your held items into the shadow realm on roundstart.

Co-authored-by: FernandoJ8 <80640114+FernandoJ8@users.noreply.github.com>
2021-04-15 16:22:09 +01:00
SkyratBot
7b823360c0 [MIRROR] Removes Ethereal blood's shocking properties (#4912)
* Removes Ethereal blood's shocking properties (#58408)

Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com>

* Removes Ethereal blood's shocking properties

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com>
2021-04-15 16:21:43 +01:00
SkyratBot
3c5ee7bb7c [MIRROR] Fixes initialization getting stuck on paintings. (#4911)
* Fixes initialization getting stuck on paintings. (#58399)

* Fixes initialization getting stuck on paintings.

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
2021-04-15 16:21:37 +01:00
SkyratBot
06f2155c3b [MIRROR] Breaking a mirror now gives you a bad omen (#4908)
* breaking a mirror is bad for your health (#58381)

* Breaking a mirror now gives you a bad omen

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-04-14 21:03:49 +01:00
SkyratBot
5c2fdc82cb [MIRROR] Firelocks can't close if an holofan is placed on their turf (#4891)
* Firelocks can't close if an holofan is placed on their turf (#58332)

* Firelocks can't close if an holofan is placed on their turf

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-04-13 14:39:14 +01:00
SkyratBot
2a26d1a54d [MIRROR] Four New Sects, small rethemes to first 3 (#4832)
* Four New Sects, small rethemes to first 3

* Update species.dm

* Update species.dm

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-13 12:27:21 +01:00
Guilherme
a60deb0b31 [Non-Modular]The Buff nobody wanted. Wallet (#4857)
* The Buff nobody wanted

* Update wallets.dm
2021-04-13 11:56:25 +01:00
SkyratBot
9fe97850b2 [MIRROR] stations name their respective celestial bodies (#4881)
* stations name their respective celestial bodies (#58168)

* stations name their respective celestial bodies

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-04-13 11:43:19 +01:00
SkyratBot
16d386f45d [MIRROR] refactors pods, new helper for spawning items from pods through code (#4879)
* refactors pods, new helper for spawning items from pods through code (#58222)

* refactors pods, new helper for spawning items from pods through code

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-04-13 11:43:10 +01:00
SkyratBot
415c68bfe0 [MIRROR] Adds color picking as RPD right click action (#4874)
* Adds color picking as RPD right click action (#58309)

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

* Adds color picking as RPD right click action

Co-authored-by: thebleh <43266738+rdragan@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-04-13 11:33:30 +01:00