Commit Graph

919 Commits

Author SHA1 Message Date
SkyratBot
2ab15aecb5 [MIRROR] Remove all gamemodes except Dynamic (#5173)
* Remove all gamemodes except Dynamic

* qaaaaaaaa

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-25 21:20:30 +01:00
SkyratBot
c418b139be [MIRROR] Ports Mail From Kiwi Take 2: Arconomy Class Mail (#5172)
* Ports Mail From Kiwi Take 2: Arconomy Class Mail

* Update wardrobes.dm

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-25 21:20:20 +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
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
Gandalf
553b707ba3 aaa (#5016) 2021-04-18 21:31:42 +01:00
Gandalf
9decfc49f6 Revert "toggleable eyepatch side (#4949)" (#4986)
This reverts commit 774824da18.
2021-04-17 19:45:43 +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
8e982516a4 [MIRROR] Space Cash Re$prite (#4769)
* Space Cash Re$prite (#58238)

imageadd: Space cash has been resprited

* Space Cash Re$prite

Co-authored-by: Kokonut <38844529+maxymax13@users.noreply.github.com>
2021-04-09 15:50:19 +01:00
SkyratBot
3dd2983ca0 [MIRROR] You can now manufacture bone gel (#4515)
* You can now manufacture bone gel

* Update others.dm

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-03 18:22:25 +01:00
SkyratBot
80cede3490 [MIRROR] Stack splitting now uses right click (#4283)
* Stack splitting now uses right click (#57837)

Co-authored-by: Arkatos <arkatos1234@ email.com>

* Stack splitting now uses right click

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
Co-authored-by: Arkatos <arkatos1234@ email.com>
2021-03-21 01:04:35 +00:00
SkyratBot
9303763ac1 [MIRROR] Warning cone is now craftable (#4127)
* Warning cone is now craftable (#57668)

Co-authored-by: Colovorat <lolqwert569@ gmail.com>

* Warning cone is now craftable

Co-authored-by: Colovorat <35225170+Colovorat@users.noreply.github.com>
Co-authored-by: Colovorat <lolqwert569@ gmail.com>
2021-03-13 14:41:59 +00:00
SkyratBot
51f9b05247 [MIRROR] Standardises Donk Co. stylisation (#3870)
* Standardises Donk Co. stylisation

* Update emags.dm

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-03-04 21:36:55 +00:00
SkyratBot
e63094d9ae [MIRROR] adds a bitflag for no random pixel shift on dropping, adds turf_flags var to replace usage of flags_1 on turfs (#3737)
* adds a bitflag for no random pixel shift on dropping, adds turf_flags var to replace usage of flags_1 on turfs (#57263)

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

* adds a bitflag for no random pixel shift on dropping, adds turf_flags var to replace usage of flags_1 on turfs

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-03-01 17:55:55 +00:00
SkyratBot
640cc9744c [MIRROR] [Ready]Atmos enhanced. Part 1: Crystallizer and machine recipes (#3697)
* [Ready]Atmos enhanced. Part 1: Crystallizer and machine recipes (#56889)

* crystallizer

* [Ready]Atmos enhanced. Part 1: Crystallizer and machine recipes

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-02-27 18:55:16 +00:00
SkyratBot
8aee19fce6 [MIRROR] Pens and iron rods can embed again (#3670)
* Pens and iron rods can embed again (#57181)

* Pens and iron rods can embed again

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-02-26 14:17:03 +00:00
SkyratBot
39fbae46c8 [MIRROR] Updates the stackcrafting description and normal description of the daemon forge (#3671)
* Updates the stackcrafting description and normal description of the daemon forge (#57126)

* Updates the stackcrafting description and normal description of the daemon forge

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
2021-02-26 14:08:39 +00:00
SkyratBot
3d3dcc8527 [MIRROR] #57049 but only the prox check: fixes tape being able to be used on objects without proximity (#3607)
* Sticky tape no longer can be used on objects that aren't within reach. (#57103)

* #57049 but only the prox check: fixes tape being able to be used on objects without proximity

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2021-02-23 13:22:16 +00:00
OrionTheFox
fa73f9cdab Adds Loincloths (#3499)
* Add Loincloths

Adds leather and cloth loincloths, craftable with their namesake materials; also adds a sensor variant in the Autodrobe and Loadout.

* what the fuck

oh no its broken

* feck

changes defines to be correct, fixes female sprites borking, lets you fix your wedgie, and adds cloth crafting. basically fixes everything.
2021-02-20 22:00:19 +00:00
SkyratBot
d0dc199815 [MIRROR] /mob/living/proc/Life(delta_time) (#3509)
* /mob/living/proc/Life(delta_time)

* a

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-19 16:55:52 +00:00
SkyratBot
18eca27569 [MIRROR] update_appearance (#3508)
* update_appearance

* a

* a

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-19 16:08:09 +00:00
SkyratBot
43febe3145 [MIRROR] Converts many proc overrides to properly use list/modifiers, lots of other smaller things (#3433)
* Converts many proc overrides to properly use list/modifiers, lots of other smaller things

* Update human_defense.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-17 14:18:21 +00:00
SkyratBot
b332b46b65 [MIRROR] Remove hideous inline tab indentation, and bans it in contributing guidelines (#3394)
* Remove hideous inline tab indentation, and bans it in contributing guidelines

* a

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-15 15:32:02 +00:00
SkyratBot
a765e5b0db [MIRROR] Pirates are split into three different ghastly crews! (#3395)
* Pirates are split into three different ghastly crews! (#56264)

Co-authored-by: DeAndre <robustness13@ hotmail.com>
Co-authored-by: itseasytosee <55666666+itseasytosee@ users.noreply.github.com>
Co-authored-by: tgstation-server <tgstation-server@ tgstation13.org>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Pirates are split into three different ghastly crews!

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: DeAndre <robustness13@ hotmail.com>
Co-authored-by: itseasytosee <55666666+itseasytosee@ users.noreply.github.com>
Co-authored-by: tgstation-server <tgstation-server@ tgstation13.org>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-02-15 13:32:35 +00:00
SkyratBot
b902f89062 [MIRROR] Refactor can_inject, and introduce try_inject (#3300)
* Refactor can_inject, and introduce try_inject (#56816)

Splits can_inject into can_inject and try_inject. The latter can perform side effects, while the former cannot. Moved the show_error bool parameter to a flag that try_inject checks.

Changes the signature to can_inject(mob/user, target_zone, injection_flags). This was previously redefined in several places, making it impossible to use named parameters. This refactor now allows named parameters to be used, and thus avoiding the ugliness of TRUE, FALSE, FALSE in parameters.

* Refactor can_inject, and introduce try_inject

Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
2021-02-11 19:49:47 +00:00
SkyratBot
e33adb614d [MIRROR] Updates Bronze to be a lot better, fixes bugs and allows it to be used on grilles. (#3262)
* Updates Bronze to be a lot better, fixes bugs and allows it to be used on grilles. (#56696)

* Updates Bronze to be a lot better, fixes bugs and allows it to be used on grilles.

Co-authored-by: CRITAWAKETS <sebastienracicot@hotmail.com>
2021-02-10 11:55:12 +00:00
SkyratBot
cc9ef500c7 [MIRROR] repaths plasteel tiles to iron (#3155)
* repaths plasteel tiles to iron

* Update robot_modules.dm

* a

* fuck me

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 23:29:36 +00:00
SkyratBot
cc67a133e5 [MIRROR] [READY] Adds station traits: Small modifiers that can randomly be chosen each round (#3132)
* [READY] Adds station traits: Small modifiers that can randomly be chosen each round

* conflicts

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 23:07:24 +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
732f917bd2 [MIRROR] New emergency storage sprites (#3076)
* Unique sprites for emergency o2 tank boxes (#56624)

* New emergency storage sprites

Co-authored-by: Kokonut <38844529+maxymax13@users.noreply.github.com>
2021-02-04 21:19:58 +00:00
SkyratBot
f18f2ad02f [MIRROR] Pipeguns: Elitism Edition (#3054)
* Pipeguns: Elitism Edition

* fixes

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-04 16:25:10 +00:00
SkyratBot
70024ef6ad [MIRROR] Reverts Adds Neon Carpet (#55782) (#3040)
* reverts Adds Neon Carpet (#55782), it appears to have been causing massive amounts of maptick (#56496)

It appears to have been causing massive amounts of maptick, this'll need a testmerge so we can test my hypothesis

* Reverts Adds Neon Carpet (#55782)

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-02-03 10:22:43 +01:00
Gandalf
34d8917ebc Aesthetics fixes (#2986)
* fixes

* a
2021-01-31 16:40:05 +00:00
Azarak
311089f611 [WIP] Combat rework - less lethality, less hardstuns, nonlethal takedowns. Focus on combat ineffectivity (#1285)
* woo

* ye

* base done

* some stuff

* weh

* bang bang

* Update carbon_defense.dm

* stuff

* Update stunbaton.dm

* flash

* Update carbon.dm

* weh

* weh

* Update stun.dm

* weh

* Update combat.dm

* a

* aaa

* a

* aaaa

* aa

* hh

* h

* Update combat.dm

* a

* Update other_reagents.dm

* a

* Update pie.dm

* Update combat.dm

* Update pie.dm

* Update combat.dm

* Update combat.dm

* Update combat.dm

* aaa

* aaa

* a

* aaa

* Update combat.dm

* Update combat.dm

* aa

* aaa

* Update carbon_defense.dm

* Update living.dm

* aaa

* Update combat.dm

* aaaa

* Update combat.dm

* aaaa

* Update combat.dm

* Update cat2_medicine_reagents.dm

* Update combat.dm

* Update misc.dm

* Update misc.dm

* Update misc.dm

* Update door.dm

* a

* Update life.dm

* aaa

* aaa

* Update code/_onclick/item_attack.dm

* Update code/game/machinery/doors/airlock.dm

* Update code/game/machinery/doors/door.dm

* Update code/game/machinery/doors/door.dm

* Update code/game/objects/items/grenades/flashbang.dm

* Update modular_skyrat/master_files/code/modules/mob/living/carbon/carbon_say.dm

* Update modular_skyrat/modules/blueshield/code/game/objects/items/melee/misc.dm

* Update modular_skyrat/modules/blueshield/code/game/objects/items/melee/misc.dm

* Update modular_skyrat/modules/blueshield/code/game/objects/items/melee/misc.dm

* Update code/modules/surgery/bodyparts/parts.dm

* Update code/game/objects/items/grenades/flashbang.dm

* Update code/game/objects/items/grenades/flashbang.dm

* Update code/game/objects/items/grenades/flashbang.dm

* Update code/game/objects/items/melee/misc.dm

* Update code/game/objects/items/melee/misc.dm

* Update code/game/objects/items/melee/misc.dm

* Update code/game/objects/items/melee/misc.dm

* Update code/game/objects/items/melee/misc.dm

* Update code/game/objects/items/melee/misc.dm

* Update code/game/objects/items/melee/misc.dm

* Update code/game/objects/items/stunbaton.dm

* Update code/game/objects/items/stunbaton.dm

* Update code/game/objects/items/stunbaton.dm

* Update code/game/objects/items/stunbaton.dm

* Update code/game/objects/items/stunbaton.dm

* Update code/game/objects/items/stunbaton.dm

* Update code/game/objects/items/stunbaton.dm

* Update code/game/objects/items/stunbaton.dm

* Update code/game/objects/items/stunbaton.dm

* Update code/game/objects/items/stunbaton.dm

* Update code/game/turfs/open/_open.dm

* Update code/game/turfs/turf.dm

* Update code/modules/antagonists/abductor/equipment/abduction_gear.dm

* Apply suggestions from code review

* Update modular_skyrat/master_files/code/modules/mob/living/carbon/carbon_say.dm

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-01-29 23:16:05 +00:00
SkyratBot
e0727dd6a4 [MIRROR] fixes various grammar issues (#2935)
* fixes various grammar issues (#56446)

fixes misspellings of 'permanently'
fixes grammar with bandaging wounds on yourself

* fixes various grammar issues

Co-authored-by: elle <54373583+dermondarble@users.noreply.github.com>
2021-01-29 12:06:57 +00:00
SkyratBot
d46cde8eae [MIRROR] Adds the Hauntium material, which turns any item into a ghost (with AI) (#2918)
* Adds the Hauntium material, which turns any item into a ghost (with AI) (#55728)

* Adds the Hauntium material, which turns any item into a ghost (with AI)

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2021-01-28 03:06:55 +01:00
SkyratBot
902f0a06d7 [MIRROR] Adds Neon Carpet (#2882)
* Adds Neon Carpet

* HARDSET

* Update tgstation.dme

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-01-25 17:01:58 +00:00
SkyratBot
6bab35951b [MIRROR] Frame stacking fix and unit test addition. (#2833)
* Frame stacking fix and unit test addition. (#56287)

* Reverts #56205

* Allow things without density to bypass checks

* The rest of the owl

* The rest of the owl

* Doc and tweak

* More feex

* RCD machine frame unit test

* I suck

* AAAAA

* Bad at unit tests

* Revert unit tests (for including in another PR)

* Fix windoor_assembly return logic

* Comment /mob/living/proc/PushAM logic

* Windoor assembley logic tweak

* Fix frame stacking

* Unit test

* Better wording from macros?

* Frame stacking fix and unit test addition.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-01-22 15:31:26 +00:00
SkyratBot
94f9a384b0 [MIRROR] [READY] Bespoke Datum Mats (#2737)
* [READY] Bespoke Datum Mats

* Update sheetifier.dm

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-01-17 13:25:04 +01:00
SkyratBot
c80aec0b74 [MIRROR] Fixing bugs about the worst simple_animal coded in and material tiles. (#2654)
* Fixing bugs about the worst simple_animal coded in and material tiles. (#54885)

Fixed floorbots applying floor tiles onto already tiled turfs.
Fixed floorbot issues with material tiles.
Fixed emagged floorbots spawning lattice when deconstructing floor into plating.

* Fixing bugs about the worst simple_animal coded in and material tiles.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-01-12 06:54:10 +01:00
SkyratBot
7361de863c [MIRROR] Refactor caltrop component into element (#2651)
* Refactor caltrop component into element

* Delete caltrop.dm

* Update caltrop.dm

Co-authored-by: coiax <jack@billbuddy.co.uk>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-01-12 02:06:53 +01:00
SkyratBot
f79e91462c [MIRROR] LINDA Reforged (#2573)
* LINDA Reforged

* Update airlock.dm

* Update biohazard_blob_controller.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-01-08 18:52:35 +01:00
Azarak
7a6c5eefa2 Removes meat and pizza materials (#2540) 2021-01-07 21:05:57 +01:00
SkyratBot
635d2d5aa1 [MIRROR] Fixes borg tiles (#2431)
* Fixes borg tiles (#55858)

- Fixes greyscale material floor tiles created from cyborg stacks
- Makes cyborg stacks contain materials
- Prevents a potential bug involving metalgen and stacks

* Fixes borg tiles

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2021-01-01 19:57:00 +00:00
SkyratBot
d7f054b035 [MIRROR] Refactors monkeys into a species (#2379)
* Refactors monkeys into a species

* aaa

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-31 21:08:07 +01:00
Azarak
0992fc86a5 Medical update - Muscle wound, Splints, Bandages, Closer Examine (#2336)
* everything but wound topics

* Update bodypart_aid.dm

* aaa

* aaa

* aaa

* aaaa

* Update _bodyparts.dm

* Update carbon_examine.dm

* Update bodypart_aid.dm

* Update slash.dm

* Wound topics, self grasping on a topic, bandages on top uniform

* Merge branch 'master' into med
2020-12-29 23:48:58 +00:00
SkyratBot
94ed7ed0f1 [MIRROR] Refactors how movetypes are added and removed, No timers this time. (#2358)
* Refactors how movetypes are added and removed, No timers this time. (#55444)

* Refactors how movetypes are added and removed, No timers this time.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-12-29 02:39:03 +00:00
SkyratBot
45a4ffc3f9 [MIRROR] Fix grammar of smashing sheets of glass (#2344)
* Fix grammar of smashing sheets of glass (#55737)

The message was missing the indefinite article, meaning you would "leave
shard", rather than "leaving a shard".

* Fix grammar of smashing sheets of glass

Co-authored-by: coiax <yellowbounder@gmail.com>
2020-12-27 23:35:18 +00:00
Azarak
6b399baf30 Adds constructable sauna ovens. Hot and steamy (#2242)
* aaa

* oops

* very good catch mr lint

* Update sauna_oven.dm
2020-12-19 15:30:57 +00:00
SkyratBot
66c207e19c [MIRROR] Reverts (#54963) due to timer spam (#2109)
* Revert "Refactors how movetype flags are added and removed and the floating animation (#54963)" (#55432)

This reverts commit b8425c003a.

* Reverts (#54963) due to timer spam

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2020-12-10 05:58:05 +01:00