Commit Graph

531 Commits

Author SHA1 Message Date
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
SkyratBot
4b350667c8 [MIRROR] Add deathrattle implant for nuclear operatives (#2810)
* Add deathrattle implant for nuclear operatives (#55903)

Deathrattle implant, comes in box of 8, implant yourself and others, and
you'll get a little notification when they die.

Intended for nuke ops, price around the same as the codebook, since it's
a utility communication item, that actually "plans to fail", so it can't
be too expensive, because it doesn't help them win, just lets them know
how much they are losing by.

* Add deathrattle implant for nuclear operatives

Co-authored-by: coiax <yellowbounder@gmail.com>
2021-01-21 14:20:49 +01:00
SkyratBot
7402ba86a8 [MIRROR] Adds database tracking to maintenance pills (#2747)
* Adds database tracking to maintenance pills (#56179)

I originally added maintenance pills, and while already perfect, I felt like polishing them a bit. I didn't do much, just:

- Maintenance pills now track a players score. Gotta eat em all to get that leaderboard highscore!
- More names and decriptions for maintenance pills, most of them suggestions from the old PR
- Renamed floorpill to pill/maintenance in code because that's what they are, no idea why I didn't originally do it

I've also polished the sprite a little bit, because it always looked a bit _too_ shady
![image](https://user-images.githubusercontent.com/7501474/104741899-19624880-574a-11eb-8211-65d89d8d36c4.png)
(Below is old sprite, above is new sprite)

* Adds database tracking to maintenance pills

Co-authored-by: Time-Green <timkoster1@hotmail.com>
2021-01-17 13:39:53 +01:00
MissFox0810
24466daf22 removes Uraium from matsbox, debugtools (#2603)
* removes Uraium from matsbox, debugtools

* Update code/game/objects/items/storage/boxes.dm

Co-authored-by: Azarak <azarak10@gmail.com>

Co-authored-by: MissFox <github@aesir.org.uk>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-01-09 23:04:17 +01:00
SkyratBot
940b4df0bf [MIRROR] Resprites for Leather Satchel & Briefcases (#2537)
* Resprites for Leather Satchel & Briefcases (#55974)

Co-authored-by: TWAT <twaticus.tg@ gmail.com>

* Resprites for Leather Satchel & Briefcases

Co-authored-by: Twaticus <46540570+Twaticus@users.noreply.github.com>
Co-authored-by: TWAT <twaticus.tg@ gmail.com>
2021-01-07 18:30:52 +01:00
SkyratBot
89da9c0b88 [MIRROR] minor cytology related tweaks (#2528)
* minor cytology related tweaks (#55910)

makes the new cytology items compatible with Biobags and Labcoats

* minor cytology related tweaks

Co-authored-by: 小月猫 <alina.r.starkova@gmail.com>
2021-01-07 00:14:12 +01: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
3711feef02 [MIRROR] wrenches the diy dish kit (#2322)
* wrenches the diy kit (#55701)

* wrenches the diy dish kit

Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
2020-12-25 21:41:34 +00:00
SkyratBot
d5148ab919 [MIRROR] adds new wiz spell: duffelbag curse (#2304)
* adds new wiz spell: duffelbag curse (#55286)

it gives target a no drop duffelbag which every around 100s will try check if there is food inside else it attacks you, you can poison the food to make it die faster.
more variety for wiz to annoy crew that isnt murder bone

* adds new wiz spell: duffelbag curse

Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
2020-12-24 12:34:53 +01:00
Azarak
f964b1b562 aaa (#2240) 2020-12-19 15:26:10 +00:00
SkyratBot
0e26de1f3e [MIRROR] You can sacrifice souls to toolboxes (#2152)
* You can sacrifice souls to toolboxes (#55306)

So, now that it's December, this PR makes it so you can use a soulstone with a shade in it on a mechanical toolbox to sacrifice the shade to give the toolbox back its SOUL (it goes back to the old sprite)

* You can sacrifice souls to toolboxes

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2020-12-13 00:51:38 +00:00
SkyratBot
0c14229ef4 [MIRROR] Adds in the admin outfit. (#2123)
* Adds in the admin outfit. (#55374)

So i was told to make this if i wanted to get an outfit that actually could work on things like radiation. I also gave it a box full of stabilized extracts because those give quite good effects like more speed and regeneration.

* Adds in the admin outfit.

Co-authored-by: CRITAWAKETS <sebastienracicot@hotmail.com>
2020-12-11 00:26:34 +00:00
Zenitheevee
28bc070e57 ExpansiveSmuggling (#2035) 2020-12-07 00:36:32 +00:00
SkyratBot
2913364658 [MIRROR] Kills oldfood, Puts newfood on top. (#2041)
* Kills oldfood, Puts newfood on top. (#55160)

Slays the last of old-food, making new-food the new normal.

Co-authored-by: MrMelbert <kmelbert4@ gmail.com>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>

* Kills oldfood, Puts newfood on top.

* Update collars.dm

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: MrMelbert <kmelbert4@ gmail.com>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-04 16:46:26 +01:00
SkyratBot
c487c73f39 [MIRROR] Grep for space indentation (#1969)
* Grep for space indentation

* aa

* Update species.dm

* Update species.dm

* Update maps.dm

* Update examine.dm

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-01 12:26:41 +01:00
Azarak
b989accb77 [NON-MODULAR] The 30TC traitor update (#1744)
* a

* Update uplink_items.dm

* Update uplink_items.dm

* aaa

* Update uplink_kits.dm

* Update uplink_items.dm

* Update uplink.dm

* Update uplink_items.dm

Co-authored-by: Gandalf <jzo123@hotmail.com>
2020-11-29 16:09:02 +00:00
Azarak
ecdb48d0c8 Duffelbags now slow you down less (#1914)
* Update backpack.dm

* Update backpack.dm
2020-11-28 21:12:59 +00:00
SkyratBot
e6879819ea [MIRROR] CanUseTopic() refactor. (#1829)
* CanUseTopic() refactor. (#54747)

* CanUseTopic() refactor.

* Forgot about default_can_use_topic. Tested and working.

* Update bin.dm

* no-nonsense.

* CanUseTopic() refactor.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-11-25 13:56:56 +01:00
SkyratBot
65368300d2 [MIRROR] Refactors Pastries into newfood. (#1824)
* Refactors Pastries into newfood. (#54996)

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: Floyd <Floydje123@ hotmail.com>

* Refactors Pastries into newfood.

* Update collars.dm

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: Floyd <Floydje123@ hotmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2020-11-25 01:02:00 +00:00
SkyratBot
7d653f1f6b [MIRROR] Moves grown food to newfood (#1794)
* Moves grown food to newfood (#55040)

Moves grown food to newfood
Gives trash element support for callbacks for item creation override

* Moves grown food to newfood

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-11-23 22:35:35 +00:00
SkyratBot
89a8cb991a [MIRROR] moves misc food to newfood code (#1725)
* moves misc food to newfood code (#54788)

misc food is now using newfood code

* moves misc food to newfood code

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-11-19 07:21:23 +01:00
SkyratBot
964adb7828 [MIRROR] Fixes disabled limbs from compound fractures, only robotic limbs can be disabled by pure damage now (#1709)
* Fixes disabled limbs from compound fractures, only robotic limbs can be disabled by pure damage now (#54922)

* Fixes disabled limbs from compound fractures, only robotic limbs can be disabled by pure damage now

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2020-11-17 00:50:36 +01:00
SkyratBot
9e88359f04 [MIRROR] Re-assesses 99% of vending prices through Arconomics to match player resources and round-length. (#1686)
* Re-assesses 99% of vending prices through Arconomics to match player resources and round-length. (#54715)

* The Re-pricening

* Rewritten and adjusted for paycheck defines.

* I made the map changes finally.

* And the refills too.

* "OH YEAH REPLACING IT ALL WITH DEFINES AND SCALING IT THE EXCEL DOCUMENT WILL BE EASY, ARCANE!!!"

* And the premium ones too.

* Accidently spoiled a future pr due to dme bleedover

* Re-assesses 99% of vending prices through Arconomics to match player resources and round-length.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2020-11-14 21:49:11 +01:00