Commit Graph

554 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
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
SkyratBot
9ffdf58259 [MIRROR] Some explosions code cleanup (#4276)
* Some explosions code cleanup (#57493)

Clears out two deprecated explosions systems (explosion ids and explosion levels)
Refactors a bunch of contents_explosions procs to be maybe slightly faster.
Cleans up a bunch of ex_act code.
Slightly cleaner code
A few less unused vars on /atom and /turf

* Some explosions code cleanup

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2021-03-21 01:03:36 +00:00
SkyratBot
165f501ba1 [MIRROR] fixes the ancient bundle not working at all (#4197)
* fixes the ancient bundle not working at all

* Update uplink_kits.dm

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-03-17 21:53:47 +00:00
DuffCreeper
acef6080a9 we mop bois (#4089)
idfk, this only happened because if a broom can go on a belt, so can a mop
2021-03-12 22:39:20 +00:00
SkyratBot
a838bbad17 [MIRROR] Gives ERT Medical Officers a box of plushies (#3991)
* Gives ERT Medical Officers a box of plushies (#57481)

* Gives ERT Medical Officers a box of plushies

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-03-08 07:40:49 +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
b2d1ab6862 [MIRROR] Re-adds agent ID cards to various syndicate uplink kits. (#3840)
* Re-adds agent ID cards to various syndicate uplink kits. (#57333)

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

* Re-adds agent ID cards to various syndicate uplink kits.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-03-04 01:04:35 +00:00
SkyratBot
3a4c912ae0 [MIRROR] Unhackable safes no longer mention their service panel in their examine. (#3833)
* Unhackable safes no longer mention their service panel in their examine. (#57334)

* Unhackable safes no longer mention their service panel in their examine.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-03-04 01:03:43 +00:00
SkyratBot
e0f514671e [MIRROR] Creates offstation variants of the protolathe and circuit imprinter for offstation and ghost roles. (#3825)
* Creates offstation variants of the protolathe and circuit imprinter for offstation and ghost roles. (#57367)

* Creates offstation variants of the protolathe and circuit imprinter for offstation and ghost roles.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-03-04 01:02:30 +00:00
SkyratBot
13d372abf7 [MIRROR] Adds new Special Syndicate Bundle, "Ancient" (#3800)
* Adds new Special Syndicate Bundle, "Ancient"

* Update uplink_kits.dm

Co-authored-by: YakumoChen <king_yoshi42@yahoo.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-03-03 18:29:28 +00:00
Tom
04b60cb176 Repaths agent IDs in modular smuggler's satchels and traitor loadouts (#3804)
* fixes agent ID repath in smuggler satchel

* repaths for modular traitor loadouts

* forgot this one oops
2021-03-03 16:31:33 +00:00
SkyratBot
53938baf04 [MIRROR] Wallets no longer show redundant examine text for ID cards. (#3784)
* Wallets no longer show redundant examine text for ID cards.

* Update wallets.dm

* Update wallets.dm

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-03-03 02:44:44 +00:00
SkyratBot
a05f7e863a [MIRROR] Fully implements the ID Card design document (#3729)
* Fully implements the ID Card design document

* Oh fuck that hurt.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-03-03 01:54:25 +00:00
OrionTheFox
9fa6dac9e5 Lets medibelts hold hospital gowns (#3638)
Fits hospital gowns into medical belts, for on-site surgeons, paramedics, or doctors who just prefer belts
2021-02-25 13:42:25 +00:00
OrionTheFox
27757f0e04 Adds Hospital Gowns (#3552)
Surgery-compatible gown to let patients stay modest. Available in protolathes for plastic, the medidrobe, and pre-spawned in surgery duffel bags - fast equip times onto others. Sprites made by Kroto
2021-02-21 16:38:04 +00:00
SkyratBot
0a6cc5e475 [MIRROR] cult construct stuff (#3553)
* cult construct stuff (#57027)

edits sprites for wizard cult constructs to have more sheen
fixes wizard cult constructs not working
makes soulstone code a bit cleaner i think
makes cult spells use second defines
fixes wraith jaunts being invisible

* cult construct stuff

Co-authored-by: Fikou <piotrbryla@onet.pl>
2021-02-21 02:49:11 +00:00
SkyratBot
4c0077d6ab [MIRROR] Fixes Cigarettes being lit in no-oxygen environments (#3507)
* Fixes Cigarettes being lit in no-oxygen environments (#56911)

This closes #26487 (Issue about cigs working fine in non-oxygenated enviroments) which has been a known bug for years. Everyone knows how EXTREMELY CRITICAL cigarettes are to game balance. Plasmamen being able to smoke in a room with no oxygen? Spessmen smoking in the hard vacuum of space? What is this madness?!?

I must put an end to these OP tactics.

My changes make it so that if a cigarette has either one mole of oxygen in the current atmosphere or is injected with oxygen reagents, then it can be smoked.

I've also made it so "Space" cigarettes can be smoked in space by changing the default starting reagents to include oxygen. The description was also updated to hint that they can be smoked anywhere.

Also I added a has_gas proc to gasmixtures. I have seen a few places in the code where this can be used and once this gets merged, I will be doing a refactor to clean some code involving it. (bonfires, plasmamen code, etc.)

(Note from lemon, if you use this in the supermatter I will eat you)

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

* Fixes Cigarettes being lit in no-oxygen environments

Co-authored-by: Tim <timothymtorres@gmail.com>
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@ users.noreply.github.com>
2021-02-19 17:03:09 +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
accafd8deb [MIRROR] Cleans up living duffel bag code to meet guidelines (#3501)
* Cleans up living duffel bag code to meet guidelines (#57014)

* Cleans up living duffel bag code to meet guidelines

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2021-02-19 13:08:50 +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
YakumoChen
8d20e999ee Yet more special description contraband (#3428)
* mystify radio jammer

* Update emags.dm

* Update emags.dm

* Update toolbox.dm

* syndie duffels

* Update emags.dm
2021-02-17 01:19:51 +00:00
SkyratBot
0cf8d6a649 [MIRROR] Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols (#3403)
* Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols (#56754)

* Gives the sniper rifle a suppressor overlay so that it no longer shows up as missing a sprite, also fixes donksoft pistols by repathing them from pistols over repathing them from toy saber smgs. Creates a flag for checking if a gun needs a toy overlay, so it is handled in the parent.

* Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols

* Update maint_loot_common.dm

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-15 17:48:59 +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
be1e6ae01d [MIRROR] Gives wizard constructs a purple theme. Minor construct fixes. (#3361)
* Gives wizard constructs a purple theme. Minor construct fixes.  (#56758)

* Gives wizard constructs a purple theme. Minor construct fixes.

Co-authored-by: itseasytosee <55666666+itseasytosee@users.noreply.github.com>
2021-02-13 23:21:05 +00:00
SkyratBot
ac54e1f38f [MIRROR] Engineering ERT members get power tools (#3214)
* Engineering ERT members get power tools (#56589)

Engi ERT now get power tools, upgraded RCDs, and a rapid pipe dispenser.

* Engineering ERT members get power tools

Co-authored-by: NotRanged <rangedvdk@gmail.com>
2021-02-08 23:49:29 +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
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
e890b1282b [MIRROR] Replaces intents with combat mode (#3063)
* Replaces intents with combat mode

* updates

* a

* Update living_defense.dm

* https://github.com/tgstation/tgstation/pull/56638/files

* gunsafety!

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 16:58:16 +01: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
dcb4dede41 [MIRROR] Fixes Several Holodeck Infinite Materials Exploits (#3057)
* Fixes Several Holodeck Infinite Materials Exploits (#56587)

* Fixes Several Holodeck Infinite Materials Exploits

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
2021-02-04 00:14:40 +00:00
SkyratBot
1e1d408b7f [MIRROR] Changes fireman carrying from a trait on gloves to a skillchip (#3046)
* Changes fireman carrying from a trait on gloves to a skillchip (#56593)

* Changes fireman carrying from a trait on gloves to a skillchip

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2021-02-03 22:36:56 +00:00
SkyratBot
0344fc271a [MIRROR] Duffelbag Curse: Sane Edition 2: Melee? (#3045)
* Duffelbag Curse: Sane Edition 2: Melee? (#56438)

* Makes duffelbag curse less cheesey and more for what it was intended to do by limiting the number of bags you can have forced on you

* Makes casting the spell a whisper. Because putting duffelbags on sec while disguised sounds really funny.

* Makes duffelcurse equivalent to the blind spell in cooldown and cost

* Duffelbag Curse: Sane Edition 2: Melee?

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2021-02-03 22:36:41 +00:00
Gandalf
34d8917ebc Aesthetics fixes (#2986)
* fixes

* a
2021-01-31 16:40:05 +00:00
SkyratBot
1a1d7be11a [MIRROR] Adds missing duffelbags for some jobs and update their respective vendors and closets. (#2967)
* Adds missing duffelbags for some jobs and update their respective vendors and closets.

* Update roboticist.dm

Co-authored-by: Tristrian <Tiago.A.C.9@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-01-31 16:39:53 +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
d581ef7a4b [MIRROR] The day has come gamers, the mosin nerf/rework (#2883)
* The day has come gamers, the mosin nerf/rework (#56319)

* THE NERF

* fixes a dumb mistake

* Sanity check and second thoughts

* mosin jamming

* adds the cleaning supplies, sprites, slight changes to dmg and jamming and HNNNG ONE LAST BUG

* adds maint kit to russian surplus, second try at fixing

* everything is fixed now :)

* finishing touches

* Last fix?

* fix

* fix var names

* a new sound and few more fixes

* add /brand_new variant to all ert/special spawned mosins, added a check if bolt is locked

* Bolt_locked is true when bolt is open 😂

* added a clamp just in case

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

* The day has come gamers, the mosin nerf/rework

* Update to use our realism

Co-authored-by: Sparkezel <53384660+Sparkezel@users.noreply.github.com>
Co-authored-by: Sparkezel <1haslo4@ gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-01-25 16:17:46 +00:00
SkyratBot
dc9dd9a6bc [MIRROR] Lets more things be put on trays (#2878)
* Lets more things be put on trays (#56386)

* Lets more things be put on trays

Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>
2021-01-25 15:04:46 +00:00
SkyratBot
ae17e5b81d [MIRROR] mining keys to open tendrills crates buyable with miner points alt to #56263 (#2839)
* mining keys to open tendrills crates buyable with miner points (#56267)

* mining keys to open tendrills crates buyable with miner points alt to #56263

Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
2021-01-23 17:35:28 +00:00