Commit Graph

34393 Commits

Author SHA1 Message Date
Cheshify
f811e319cd ignore the branch name please (#5048) 2021-04-22 01:29:10 +01:00
SkyratBot
4440140319 [MIRROR] The CE can now buy the BYOS (#5079)
* The CE can now buy the BYOS (#58389)

* The CE can now buy the BYOS

* aaa

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-22 01:27:04 +01:00
SkyratBot
96c0c9527e [MIRROR] Removes drone restrictions from bardrone (#5078)
* Bardrone can bardrone again (#58505)

* Removes drone restrictions from bardrone

Co-authored-by: Yenwodyah <yenwodyah@gmail.com>
2021-04-22 00:41:02 +01:00
SkyratBot
2c97173fd1 [MIRROR] Fixes incorrect description for the mitosis nanite program. (#5077)
* Fixes inaccurate description for mitosis nanites program. (#58510)

* Fixes incorrect description for the mitosis nanite program.

Co-authored-by: Cimika/Lessie/KathyRyals <65850818+KathyRyals@users.noreply.github.com>
2021-04-22 00:40:38 +01:00
SkyratBot
7de0aaf82d [MIRROR] Fixes emitter welding issue (#5076)
* weldies (#58560)

* Fixes emitter welding issue

Co-authored-by: Seth Scherer <supernovaa41@protonmail.com>
2021-04-22 00:40:16 +01:00
SkyratBot
0053842917 [MIRROR] Fixes some oddities on wintercoats and labcoats allowed items. (#5073)
* Fixes some oddities on wintercoats and labcoats allowed items. (#58195)

* Fixes weird allowed items in wintercoat

* Removes repeated allowed items in wintercoats

* Basic Labcoats can't hold batons anymore

* Fix mistake on heads wintercoats

* Fix me almost giving batons to all doctors again

* Fix the same issue with RD now

* Fixes some oddities on wintercoats and labcoats allowed items.

Co-authored-by: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com>
2021-04-21 19:21:08 +01:00
SkyratBot
8b0de23b6d [MIRROR] Small clean up on clown uniform code (#5070)
* Clean up clown_mime (#58524)

* Small clean up on clown uniform code

Co-authored-by: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com>
2021-04-21 18:34:03 +01:00
SkyratBot
26bdc03e28 [MIRROR] Fixes the issues reintroduced by #58564, In a less silly way (#5068)
* Fixes the issues reintroduced by #58564, In a less silly way (#58566)

Fun fact, there was already a define for qdeling a lazy list. We didn't need to make our other one behave the exact same way

* Fixes the issues reintroduced by #58564, In a less silly way

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-04-21 18:33:52 +01:00
SkyratBot
a9982c9ecd [MIRROR] Uncomments tram_surfer achievement (#5055)
* Uncomments tram_surfer cheevo (#58540)

* Uncomments tram_surfer achievement

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
2021-04-21 04:08:26 +01:00
SkyratBot
393b26534e [MIRROR] Robot Factory now replaces you if you're jobbanned from cyborg (#5054)
* Robot Factory now replaces you if you're jobbanned from cyborg (#58554)

* Robot Factory now replaces you if you're jobbanned from cyborg

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-04-21 04:08:18 +01:00
SkyratBot
86ef002197 [MIRROR] Thermomachine pipe color change (#5041)
* Thermomachine piping layer (#58303)

This PR allow the players to change the thermomachines pipe color with the multitool right click when it's unanchored.
plus some fixes for hitting the machine with tools

* Thermomachine pipe color change

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-04-20 16:28:32 +01:00
SkyratBot
ff1ed23942 [MIRROR] Fix connect_loc not reconnecting turf changes (#5040)
* Fixes connect_loc not reconnecting turf changes (#58507)

* Fix connect_loc not reconnecting turf changes

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-04-20 16:28:25 +01:00
SkyratBot
3d6fcd4698 [MIRROR] Grammatical Changes in Codex Cicatrix's rust path. (#5038)
* Grammatical Changes in Codex Cicatrix's rust path (#58537)

Changes harm intent to combat mode.

* Grammatical Changes in Codex Cicatrix's rust path.

Co-authored-by: Seth Scherer <supernovaa41@protonmail.com>
2021-04-20 16:27:33 +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
SkyratBot
e34cc0209a [MIRROR] Fixes eye organ manipulation pre op and success text (#5030)
* organs (#58530)

* Fixes eye organ manipulation pre op and success text

Co-authored-by: Seth Scherer <supernovaa41@protonmail.com>
2021-04-20 02:47:05 +01:00
linnpap
9b049ef53f [Semi-Modular?] More narcotics (#4943)
* quaaludes

* cocaine runnin round in my brain

* crack + cocaine powder + other shit

* Update cocoa_vanilla.dm

* newlines

* adds export value to crack and cocaine, fixes descriptions

* good god why is it failing its fine ingame

* please just fucking work

* remove shit that i put in by mistake

* Update cocaine.dm

now deals heart damage less tox damage on overdose, and now gives you a speed boost

* adds opium, heroin, and cocaine bricks + tweaks

* forgot to add poppies to the vendor, whoops

* makes the growing sprite actually show up

* fixes description of black tar heroin
2021-04-19 03:52:04 +01:00
Gandalf
03ea85c542 New biosuits & RD Labcoat (#5017)
* aaa

* aaaa
2021-04-18 23:24:57 +01:00
Gandalf
abfb646aa2 Removes assaultops (#4952)
* aAAA

* aaa
2021-04-18 20:47:10 +02:00
Gandalf
a8fd322fa1 Update emergency.dm (#5009) 2021-04-18 16:21:53 +01:00
SkyratBot
0fca6c7035 [MIRROR] emitters and collectors code improvements (#5002)
* emitters and collectors code improvements (#58454)

Refactor of collector and emitters to current standards

* emitters and collectors code improvements

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-04-18 14:26:32 +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
SkyratBot
0f642b4374 [MIRROR] Fixes borg shaker constantly melting ice (#4994)
* Fixes borg shaker constantly melting ice (#58437)

* Fixes borg shaker constantly melting ice

Co-authored-by: SpookyTheFox <67441715+SpookyTheFox@users.noreply.github.com>
2021-04-18 14:08:48 +01:00
SkyratBot
40bcfe18b5 [MIRROR] Fix a lot of nonhuman species being unable to strip (#5005)
* Fix a lot of nonhuman species being unable to strip (#58499)

Fixes #58495. Also splits every inherent_traits list into multiple lines, so that future traits can be added without conflict or hard to read diffs/blames.

* Fix a lot of nonhuman species being unable to strip

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-04-18 13:43:00 +01:00
SkyratBot
29c9908e09 [MIRROR] Adds icon state configuration to GAS (#4990)
* Adds icon state configuration to GAS (#58487)

Relatively simple change that allows you to specify icon states in greyscale config so as to allow generating icon files with multiple states. This is a requisite for GAS to work with icon smoothing.

Also a couple bits of additional warnings and documentation.

* Adds icon state configuration to GAS

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2021-04-18 01:24:43 +01: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
Matthew J
4ecc380414 [NON-MODULAR] Fixes an inconsistency where the nanite chamber couldn't interact on MOB_HUMANOID (#4985)
* Allows the Nanite Chamber to work on the same entities as the public chamber

* explaining what exactly was changed in the if statement wouldn't be a bad idea

Co-authored-by: Matthew <matthew@tfaluc.com>
2021-04-17 18:18:29 +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
SkyratBot
95456107b6 [MIRROR] Resprites beakers by CeUvi (#4983)
* Resprites beakers by CeUvi

* Update glass.dm

* Update glass.dm

Co-authored-by: Iamgoofball <iamgoofball@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-17 15:59:44 +01:00
Gandalf
f136e49b88 Actually fixes mining maps lol (#4968)
* Update mining_maps.dm

* Update mining_maps.dm

* a

* aaa

* aaaa

* Update mining_maps.dm

* aaaaa
2021-04-17 15:52:34 +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
aab2083813 [MIRROR] Ice cream vat grammar fix (#4980)
* Ice cream vat grammar fix (#58459)

Ice cream vats don't needlessly say the an additional time when dispensing cones.

* Ice cream vat grammar fix

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
2021-04-17 15:09:13 +01:00
SkyratBot
5e3399e674 [MIRROR] bluespace vendor fix (#4973)
* bluespace vendor fix (#58461)

fixes the bluespace vendor locking up if it ran out of a gas type while giving it to you.

* bluespace vendor fix

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-04-17 14:13:32 +01:00
SkyratBot
32d4b0e816 [MIRROR] Wigs can now be Stripped (#4974)
* Wigs can now be Stripped (#58468)

* Wigs can now be Stripped

Co-authored-by: Y0SH1M4S73R <legoboyo@earthlink.net>
2021-04-17 14:02:49 +01:00
SkyratBot
c3c17b9b00 [MIRROR] Adjust parameters for bone gel on_reaction (#4970)
* Adjust parameters for bone gel on_reaction (#58466)

* Adjust parameters for bone gel on_reaction

Co-authored-by: Funce <funce.973@gmail.com>
2021-04-17 14:01:22 +01:00
SkyratBot
aa0daedcb0 [MIRROR] Fixes bounty cubes paying out extremely low speedy delivery bonuses (#4965)
* Fixes bounty cubes paying out extremely low speedy delivery bonuses (#58434)

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

* Fixes bounty cubes paying out extremely low speedy delivery bonuses

Co-authored-by: JosephJomama <60072879+JosephJomama@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-04-17 03:13:14 +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
Gandalf
73a45dea8e Random mining! [DOWNSTREAM IMPORTANCE LEVEL 1] (#4957)
* aaaa

* AAAAAAAAAAAAAAAAAA

* 0..

* Update mapping.dm

* Update Rockplanet.dmm
2021-04-17 00:19:58 +02: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
c0a0c8055c Fixes edge cases revolving who can strip and who can't (#58445) (#4946)
Fixes all simple mobs being able to strip, as well as being able to strip when your hands are blocked (e.g. cuffed).

Fixes #58260.

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-04-16 13:25:55 +02:00
SkyratBot
5b392dbc4c [MIRROR] Disables drone restrictions on Derelict drones (#4919)
* Disables drone restrictions on Derelict drones (#58412)

* Disables drone restrictions on Derelict drones

Co-authored-by: Jonathan Rubenstein <jrubcop@gmail.com>
2021-04-16 13:04:35 +02:00
SkyratBot
a08d398675 [MIRROR] Renews Maintenance Drones (#4868)
* Renews Maintenance Drones

* And these have conflicts too, but you can't see them

* Skyrat Map Updates (Adding Supermatter Room Area)

Co-authored-by: Jonathan Rubenstein <jrubcop@gmail.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-04-16 13:04:21 +02:00
SkyratBot
a4546eebe3 [MIRROR] Fixes bolt hallucination runtime. (#4942)
* Fixes bolt hallucination runtime. (#58438)

* Fixes bolt hallucination runtime.

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
2021-04-16 00:58:25 +01:00
SkyratBot
942b17b533 [MIRROR] Fixes traumas caused by bone fractures not repairing after treatment (#4941)
* Fixes traumas caused by bone fractures not repairing after treatment (#58420)

* Fixes traumas caused by bone fractures not repairing after treatment

Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
2021-04-16 00:58:13 +01:00
SkyratBot
3af56dcaa3 [MIRROR] Revives trader NPCs (#4939)
* Revives trader NPCs (#58351)

Co-authored-by: Qustinnus <Floydje123@ hotmail.com>
Co-authored-by: SmArtKar <44720187+SmArtKar@ users.noreply.github.com>

* Revives trader NPCs

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Qustinnus <Floydje123@ hotmail.com>
Co-authored-by: SmArtKar <44720187+SmArtKar@ users.noreply.github.com>
2021-04-16 00:57:50 +01:00
SkyratBot
7e4a5e218d [MIRROR] Improves soulstone code (#4937)
* Removes superfluous iscultist check (#58421)

* Improves soulstone code

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
2021-04-16 00:56:59 +01:00
SkyratBot
989cd66d14 [MIRROR] Fixes the anomalous crystal spawning planetary turfs (#4935)
* Fixes the anomalous crystal spawning planetary turfs (#58374)

* Makes the colossus crystal use non planetary versions of snow and basalt tiles, to prevent infinite gas diffs

* Make it properly change the air mixture

* Fixes the anomalous crystal spawning planetary turfs

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-04-16 00:55:28 +01:00
SkyratBot
9b251add70 [MIRROR] Fly eyes now have their own sprites (#4934)
* Flypeople now have actual eyes (#58414)

* Fly eyes now have their own sprites

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
2021-04-16 00:55:13 +01:00
SkyratBot
8f3e563837 [MIRROR] Centralized dummy lookalike generation (#4933)
* Centralized dummy lookalike generation (#58366)

* Centralized dummy lookalike generation

Co-authored-by: Trigg <36010999+TriggeredBoi@users.noreply.github.com>
2021-04-16 00:55:00 +01:00
Elli-Skala
5b99026c81 Update processor.dm (#4932) 2021-04-16 00:54:45 +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