Commit Graph

594 Commits

Author SHA1 Message Date
SkyratBot 5feca8a1be [MIRROR] Replaces MATERIAL_NO_EFFECTS with MATERIAL_EFFECTS. (#7966)
* Replaces MATERIAL_NO_EFFECTS with MATERIAL_EFFECTS. (#61166)

* Replaces MATERIAL_NO_EFFECTS with MATERIAL_EFFECTS.

* build warning and codermonky's advice.

* Replaces MATERIAL_NO_EFFECTS with MATERIAL_EFFECTS.

* skyrat fixes

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
2021-09-06 08:30:35 -04:00
SkyratBot 879c955538 [MIRROR] partially fixes medical phobia by splitting dice bags off of pillbottles as a subtype (#7962)
* partially fixes medical phobia by splitting dice bags off of pillbottles as a subtype

* skyrat fixes

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
2021-09-06 08:05:47 -04:00
Pinta dcd0c70a8d [NONMODULAR] Makes Mediguns fit in CMO suit storage and makes Medicells fit inside belts. (#7852)
* labcoats and winter coats

* Medigun can now fit in medical hardsuits

* Update belt.dm

* switches it to CMO clothing only
2021-09-01 17:43:58 +01:00
Useroth f900b1ec6d [MDB IGNORE] Eliminates Toxins (#60619) (#7911)
Repaths everything referring to "toxins" while actually meaning either the room in science or plasma gas. While this PR might be disrespectful to our forefathers, given this is (I believe) a holdover from as far back as the Exadv1 days, this has constantly irked me since I started working with the code. None of the player-facing stuff has referred to plasma as toxin since before 4407 hit, besides the Toxins Lab, and yet all of the type-paths are still pointing at toxins, making it a nightmare to search for in a map editor, and making the code needlessly easy to confuse with that of toxin damage. So this just fires it into the sun.

Anything relating to Toxins, the science subdepartment, now makes reference to Ordnance instead. This felt fitting enough given the focus of the subdepartment is around the creation of and testing of explosives.
Anything relating to plasma gas has, fittingly, been made to refer to plasma gas.

Edit: Ah yes, I feel I should probably apologise off the bat for the size of this PR- the code touched is mostly atmos machinery and simplemobs, a few sprites here and there, and of course the station maps + a few offstation maps.

Makes the code more legible and makes mapping less painful.

(The payment has been made)

Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-01 16:50:22 +01:00
SkyratBot 133633ac90 [MIRROR] Objective-specific equipment will always be given. (#7862)
* Objective-specific equipment will always be given.

* Update datum_traitor.dm

Co-authored-by: Y0SH1M4S73R <legoboyo@earthlink.net>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-01 16:43:53 +01:00
SkyratBot ad35f582a9 i have moved some bible exorcism functionality to a signal on soulstones (#60768) (#7622)
moves functionality of exorcising soulstones to soulstones themselves

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-08-19 14:27:31 -04:00
SkyratBot bce50c3a84 [MIRROR] Deployable Component (Big Dakka Included) (#7380)
* Deployable Component (Big Dakka Included) (#60554)

* Deployable Component (Big Dakka Included)

Co-authored-by: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com>
2021-08-04 15:08:40 +01:00
SkyratBot f942963ce3 [MIRROR] componentized spirit item possession (#7346)
* componentized spirit item possession (#60614)

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

* componentized spirit item possession

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-08-03 20:06:06 +01:00
SkyratBot 9f7d93f3f3 [MIRROR] Remove nanites (#7210)
* Remove nanites

* a

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-07-29 00:45:17 +01:00
SkyratBot ca49a412ca [MIRROR] Lets construction bags be put in pockets like they were intended to (#7184)
* Lets construction bags be put in pockets like they were intended to  (#60460)

* Lets construction bags be put in pockets like they were intended to

Co-authored-by: jughu <melvin2626@live.nl>
2021-07-28 19:04:16 +01:00
SkyratBot efa9604388 [MIRROR] Fix wallet ID access (#7162)
* Fix wallet ID access (#60449)

* Fix wallets ID access

* Refactor id_card code to be simple

* Refactor id_card even further

* Fix wallet ID access

Co-authored-by: Tim <timothymtorres@gmail.com>
2021-07-28 19:01:28 +01:00
SkyratBot 090198f40c Kills the misc items file (#7151)
Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com>
2021-07-28 18:58:42 +01:00
SkyratBot 548401023d [MIRROR] Revert "right click to activate porta-seeder" / switches porta-seeder hotkey to ctrl-click (#7103)
* Revert "right click to activate porta-seeder" / switches porta-seeder hotkey to ctrl-click (#60316)

* Revert "right click to activate porta-seeder" / switches porta-seeder hotkey to ctrl-click

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2021-07-26 15:46:50 +01:00
SkyratBot 2e8690cec2 [MIRROR] Fixes missing space in happiness description (#7101)
* Fixes missing space in happiness description (#60391)

* Fixes missing space in happiness description

Co-authored-by: aaaa1023 <74441292+aaaa1023@users.noreply.github.com>
2021-07-26 15:46:33 +01:00
SkyratBot 56f7c55e8c [MIRROR] Adds missing space in medical ERT plushie box description (#6958)
* Adds missing space in medical ERT plushie box description (#60238)

* Adds missing space in medical ERT plushie box description

Co-authored-by: aaaa1023 <74441292+aaaa1023@users.noreply.github.com>
2021-07-16 20:34:48 +01:00
SkyratBot 4411d09e44 [MIRROR] adds a suicide for space helmets, fixes some other suicides (#6935)
* adds a suicide for space helmets, fixes some other suicides (#60173)

* adds a suicide for space helmets, fixes some other suicides

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
2021-07-15 22:57:07 +01:00
SkyratBot dd73641deb [MIRROR] Refactors a little bit of belt.dm and holsters.dm (#6894)
* Refactors a little bit of belt.dm and holsters.dm (#60104)

* Refactors a little bit of belt.dm and holsters.dm

Co-authored-by: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com>
2021-07-13 10:55:34 +01:00
Cheshify c9879ae9cf [MODULAR] Vanguard Class Reworks (also another things) (#6696)
* Pain!

* pain2

* Multitude of fixes

* Update expeditionary_trooper.dm

* Update expeditionary_trooper.dm

* Update expeditionary_trooper.dm

* Auto stash before merge of "vanguard-classes" and "origin/vanguard-classes"

* aaaa

* Update advanced_choice_beacon.dm

* Update advanced_choice_beacon.dm

* Won't pass CI or shit

* ok, close to halfway done

* Shield stuff + proper kits

* code standards? met

* Maps + So much shit

* a single exclamation mark

* better marksmen pouches + cool stuff :)

* Black Mesa + Medic Bone Saw

* Astrum + Mesa (Again)

* Wild West IS DONE

* Clown fix

* Remove

* Sigh

* fucking BONER SAW

* I'm stuff

* chem dispenser

* Minor map edits

* wildwest better + mesa remove nade

* ye this

* Less gamer gear

removed a brhs from astrum and medics don't get two times the night vision

* Final map tweaks

BlackMesa has another barricade to convince HECU not to gamer it up / Astrum has clearer boobytraps / Wildwest has more non-gamer loot, and some additional ammo for the CFA replacement.

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-07-12 22:51:22 +01:00
SkyratBot 22a02bc61b [MIRROR] Fixing Energy Gun Weapon Description Runtimes + Miscellaneous Weapon Description Fixes, Take 2 (#6850)
* Fixing Energy Gun Weapon Description Runtimes + Miscellaneous Weapon Description Fixes, Take 2 (#59778)

Fixes a runtime issue cause by the possibility of loaded_projectile being null by changing how projectile stats are obtained on energy weapons, and adds a separate line for energy ammo types that deal stamina damage and regular damage to incorporate both damage types

* Fixing Energy Gun Weapon Description Runtimes + Miscellaneous Weapon Description Fixes, Take 2

Co-authored-by: Beatrice <83368538+SpaceDragon00@users.noreply.github.com>
2021-07-12 21:45:06 +01:00
SkyratBot af778bae0a [MIRROR] Fixes a good few improper overlay icon_states, fuck gun code edition (#6774)
* Fixes a good few improper overlay icon_states, fuck gun code edition

* Update rifle.dm

* Update laser.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
2021-07-08 03:11:58 +02:00
SkyratBot 2962992e71 [MIRROR] CARP Team Six: Nanotrasen's Finest* (#6769)
* CARP Team Six: Nanotrasen's Finest* (#60012)

* CARP Team Six: Nanotrasen's Finest*

Co-authored-by: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com>
2021-07-07 23:52:09 +02:00
SkyratBot f4bcf9f9a5 [MIRROR] Control click Portaseeder (#6751)
* Control click Portaseeder (#59975)

* Control click Portaseeder

Co-authored-by: spessbro <51048066+spessbro@users.noreply.github.com>
2021-07-06 17:29:54 +01:00
SkyratBot fb5576ee8f [MIRROR] Add new Wallets! station trait (#6704)
* Add new Wallets! station trait

* Update wallets.dm

Co-authored-by: coiax <yellowbounder@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-07-04 23:59:42 +01:00
SkyratBot 7b24092dbd [MIRROR] Allows the detective's and nuke op's holsters to be placed in the suit storage slot of armor vests (#6705)
* Allows the detective's and nuke op's holsters to be placed in the suit storage slot of armor vests (#59976)

* single line change that will break everything

* now they work even better

* Trailing comma

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

* Allows the detective's and nuke op's holsters to be placed in the suit storage slot of armor vests

Co-authored-by: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-07-04 23:55:04 +01:00
SkyratBot a4172880c1 [MIRROR] Allows Bananas to be holstered (#6684)
* Allows Bananas to be holstered (#59917)

Clowntectives can now comically whip out their trusty potassium pistol to brutally feed mimes to death. Or sneak into the detective's office and replace their actual gun with a banana.

Get it, because I call you guys the banana bros all the time?

* Allows Bananas to be holstered

Co-authored-by: death and coding <58394696+thestubborn@users.noreply.github.com>
2021-07-03 22:24:48 +01:00
SkyratBot 56d4291ef6 [MIRROR] Reverts Entered() passing dir instead of old loc (#6646)
* Reverts Entered() passing dir instead of old loc (#59910)

* Reverts Entered() passing dir instead of old loc

Co-authored-by: Rohesie <rohesie@gmail.com>
2021-07-02 16:42:34 +01:00
SkyratBot d85a02babd [MIRROR] Refactors move procs to support multitle objects (#6423)
* Refactors move procs to support multitle objects

* Update _blob.dm

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-22 22:40:04 +01:00
SkyratBot 56f2e79a0a [MIRROR] Agent ID cards now jump to the front of wallets and can disguise other more powerful ID cards. (#6433)
* Change agent ID cards to jump to the front of wallets; disguise other more powerful ID cards (#59652)

Many moons after I reworked ID cards, I feel the Agent ID card needs a little bit of extra love.

This change adds an option during forging which allows the user to specify whether the agent ID card will force itself to the front-facing/visible ID slot in wallets.

This provides traitors with a way to effectively disguse any special ID cards and accesses they may have without making the agent ID card a must-buy TC tax. If your traitor strategy involves gathering many ID cards, this is a definite buff to an item that took a heavy hit to power in the rework.

* Agent ID cards now jump to the front of wallets and can disguise other more powerful ID cards.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-06-22 00:48:52 +01:00
SkyratBot 87e3a63f7d [MIRROR] During unit tests, does extra verification on text based overlays (#6415)
* During unit tests, does extra verification on text based overlays (#59553)

This makes it so during unit tests, adding a text based overlay to something will runtime if the icon does not have an icon state matching that text. I would do this during normal compiles as well but getting the icon states from an icon is surprisingly expensive.

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@ users.noreply.github.com>

* During unit tests, does extra verification on text based overlays

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@ users.noreply.github.com>
2021-06-21 00:48:24 +01:00
SkyratBot 7d1d0e1fad [MIRROR] Refactors most spans into span procs (#6315)
* Refactors most spans into span procs

* AA

* a

* AAAAAAAAAAAAAAAAAAAAAA

* Update species.dm

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-16 00:24:49 +01:00
SkyratBot 76b968aee3 [MIRROR] Makes it so the matchbox's matches visibly empty from the sprite when you take matches out (#6230)
* Makes it so the matchbox's matches visibly empty from the sprite when you take matches out (#59575)

* 4 fucking sprites

* forgot to make it call parent

* uses base_icon_state

Co-authored-by: TemporalOroboros <TemporalOroboros@ gmail.com>

* adds base_icon_state variable to matches

* base_icon_state fix

Co-authored-by: TemporalOroboros <TemporalOroboros@ gmail.com>

* Makes it so the matchbox's matches visibly empty from the sprite when you take matches out

Co-authored-by: Wallemations <66052067+Wallemations@users.noreply.github.com>
Co-authored-by: TemporalOroboros <TemporalOroboros@ gmail.com>
2021-06-10 23:49:44 +01:00
Tom 34dc405c32 Fixes and re-enables e-welder (#6233)
* fixes e-welder

* yep

* powered - > welding
2021-06-10 23:48:26 +01:00
SkyratBot d3a2f60d78 [MIRROR] GAGS Lizard Plushes (#6007)
* GAGS Lizard Plushes  (#59323)

* greyscale lizards

* repathing

* uses set greyscale

* mapped sprite

* GAGS Lizard Plushes

* Goodbye lizzers

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-06-01 14:40:42 +12:00
SkyratBot 456f347dfa [MIRROR] USE SIGNAL_HANDLER REEEEEE (#5921)
* use SIGNAL_HANDLER REEEEEE (#59242)

makes as many procs as i can find use the SIGNAL_HANDLER define which i assumed they all already did

* USE SIGNAL_HANDLER REEEEEE

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
2021-05-25 03:42:11 +01:00
SkyratBot bb4aeacfc6 [MIRROR] Componentizes Duffelbag Curse and turns it into an RPGloot modifier (+ curse announcement element) (#5683)
* Componentizes Duffelbag Curse and turns it into an RPGloot modifier (+ curse announcement element) (#59029)

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

* Componentizes Duffelbag Curse and turns it into an RPGloot modifier (+ curse announcement element)

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-05-14 15:38:12 +01:00
SkyratBot 945bff2c10 [MIRROR] The Wallening Approacheth: Adds directional variants to most wall mounts (#5551)
* The Wallening Approacheth: Adds directional variants to most wall mounts

* Update reagent_dispenser.dm

* Update CentCom_skyrat.dmm

Co-authored-by: dragomagol <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>
Co-authored-by: KathrinBailey <evesovereign@hotmail.co.uk>
2021-05-08 14:46:01 +01:00
RatFromTheJungle 0c77af689c [non-modular] copypastas #5400 (#5492)
* lordt why

* lordt why 2

* lordt why 3

* lordt why 4

* chill big smoke  its me carl
2021-05-06 04:53:52 -05:00
SkyratBot c15ed4eca0 [MIRROR] fixes poopy bronze tiles sstuff (#5237)
* fixes stuff made with bronze sheets deconstructing into tiles or not being able to make bronze golems (#58708)

* fixes poopy bronze tiles sstuff

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-05-02 00:07:16 +01:00
SkyratBot 966873beb4 [MIRROR] [READY] Tile Reskinning 2: Epic Winaloo (#5384)
* [READY] Tile Reskinning 2: Epic Winaloo

* AAA

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-05-01 14:25:42 +01:00
SkyratBot b88f65d26e [MIRROR] Resolve chameleon GAGS item issues (#5381)
* Resolve chameleon GAGS item issues

* AAAAAAAA

Co-authored-by: Celotajs <81999976+celotajstg@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-05-01 14:03:03 +01:00
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
FlamingLily 210c09cf6e Update belt.dm (#5159) 2021-04-24 18:20:39 +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
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 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
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 cf1f3fa06e [MIRROR] Refactor /obj/item/food/chewable into a chewable element (#4855)
* Refactor /obj/item/food/chewable into a chewable element (#58243)

* Refactor /obj/item/food/chewable into a chewable component

* Element, always process

* Refactor /obj/item/food/chewable into a chewable element

* Update maint_loot_trash.dm

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-13 01:32:21 +01:00
NopemanMcHalt 54b191a0ef Adjusts black and brown flannels sprites (#4795)
Also modularizes trashbag's QoL and adds belt sprites for it.
2021-04-10 19:39:38 +01:00
Gandalf b32b65fbe3 Mutants - HNZ1 - A medical and scientific adventure! (#4664)
* aaa

* AAAAAAAA

* aaa

* aaaaa

* aaa

* Update zombie_cure.dm

* Update zombie_techweb.dm

* Update zombie_cure.dm

* Update zombie_cure.dm

* a

* THEY ARE MUTANTS, NOT ZOMBIES

* aaaaa

* aaaa

* Update mutant_event.dm

* aaaaa

* aaaa

* Update mutant_cure.dm

* Update mutant_cure.dm

* aaaaaaaaaaaa

* Update mutant_parts_greyscale.dmi

* aaaa

* Create research2.dmm

* 0

* Update mutant_datum.dm

* Update research2.dmm

* aaaa

* Update mutant_datum.dm

* aaaa

* aaaa

* Update mutant_cure.dm

* Update mutant_cure.dm

* Update mutant_cure.dm

* Update mutant_datum.dm
2021-04-10 18:32:09 +01:00