Commit Graph

12499 Commits

Author SHA1 Message Date
Graham 8eab1b8600 Inhand Sprite: Flamethrower lit animation/sound/light (#46975)
* emitter has wrenched state when created

* resync with master

* adds smokey animation to lit flamethrower

* More frames, less busy

* Fixed offset error for lefthand

* adds acti/deactivate sound for flamethrower

* offset fix

* adds ambient light when flamethrower switched on

* OFFSET BLARGH
2019-10-17 18:30:50 -07:00
kingofkosmos 01d0013809 Health analyzer font scaling hotfix (#47095)
Also rounds the damage numbers.
2019-10-17 18:24:13 -07:00
Emmett Gaines 8982f509b5 Refactors screen object update_icon to call parent (#47094)
* Refactors screen object update_icon to call parent

And makes update_icon an /atom proc

* Cleans up some missed null checks

The student teaches the master
2019-10-17 18:21:50 -07:00
spookydonut cca969feea change these away from defines (#47105) 2019-10-17 10:10:51 -04:00
Firecage 8dad3bf7f5 Leather crafting menu can be used again. (#47103) 2019-10-17 11:03:08 +02:00
TheChosenEvilOne 8605ae2142 Multi-Z improvements part 2 (#47097)
* MultiZ Improvements

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* RCD works on openspace now.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* I knew something like this would happen with rebasing.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Copy-Paste is gone!

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-10-17 11:02:40 +02:00
carlarctg cc999b2815 Twat carpets have reagents/ Oil is now considered Fuel (#46930)
* bra

* ME GRAMMAR GOOD?

* asbestos in your lung

* Merge branch 'master' into CARPET

* Merge branch 'master' into CARPET

* bruh

* Revert "bruh"

This reverts commit 186de868197ee5904ae2e72060736dc3a505f66d.

* Revert "Revert "bruh""

This reverts commit a855f2b838f02b852fb16f4a15123ca5a26b858f.

* orange man, reasonable

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-Authored-By: Fel <fludd121@gmail.com>

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* cobby is a good amnitni

* e
2019-10-16 17:30:18 -04:00
Fikou 340ba6f109 fixes cavity surgery with advanced cautery (#47109)
* shdghf

* c

* bitch
2019-10-16 17:13:02 -04:00
Time-Green bca59b9a50 [READY] Plumbing: Endgame (#46759)
cl
add: Plumbing equipment is now available through the medical protolathe. It's under medical machinery boards
add: Add's a new chemistry area on metastation for chemical factories. It's located left of main surgery.
tweak: Chemistry has been turned into the Apothecary. It's basically normal chemistry, but Medical Doctors have acces aswell.
tweak: The smoke machine is now plumbing compatible. Put this knowledge to good use.
sprite: Thanks to @CRITAWAKETS for the plumbing RCD sprite!
/cl

Finally adds plumbing to the game!

Chemistry has been turned into the apothecary. For all intents and purposes it's old chem, but doctors have acces.

West of main surgery is now the new chemistry factory area.

I've also had to move stuff around alot, because you can't just add a big new room without having stuff in the way.

Currently only on metastation. I'm completely drained from adding it to meta alone and doing all maps right now will burn me out.
2019-10-17 00:10:30 +13:00
MadoFrog f63bb8bf5a Adds Shrine Maiden's Outfit to the Costume Vendor (#47090)
* Adds Shrine Maiden's Outfit

* Adds the Shrine Maiden's Wig

* Adds the gohei as a null rod transformation

* Gives the gohei purification properties

* Shrine maiden's items now lack religious significance

There's a profound comment to be made here, but I'm not smart enough to make it.

* Icons added back after rebase

* Addresses requested changes

* Adds the gohei's hitsound

* Update suit.dmi
2019-10-15 21:41:23 -04:00
81Denton e2955a3315 Makes CentCom Tomb of the Unknown Employee statue indestructible (#47066) 2019-10-15 10:50:52 -04:00
Tony 128cd843ee metal sheets build the normal metal table again (#47079) 2019-10-15 15:47:36 +02:00
KomradeSpectre 9ff071af60 Clockcult Removal 2019 (#47057)
* Nanotrasen fires the Wave Motion Gun at the Clock Cult

* Fixes a random changelog appearing from the reebe void.

* Fixes a wrong type reference regarding the bronze sheets in the Lavaland Ruin for it.

* Fixes redundant cells after CC removal in ruin by populating them with varied ore chunks, or destruction clutter.

* why is it /obj/item/stack/sheet/metal but not /obj/item/stack/sheet/iron

* Fixes the lavaland ratvar ruin to have fluff variant structures of deleted shit it referenced instead what I thought was reasonable.
2019-10-15 10:13:41 +02:00
Qustinnus 908ccfe7b3 Fixes some material datum bugs (#47049)
* fixes

* chair

* ass

* fixes

* dumb

* done

* fix
2019-10-14 00:36:56 -04:00
Fikou 31ab3ac830 power tool refactor (#46974)
Power tool refactor
2019-10-13 20:34:52 +02:00
TheChosenEvilOne f193939b57 Multi-Z fixes (#47046)
* Fixed multi-z throwing and changed isliving in stairs.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Openspace can no longer be deepfried.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-10-13 19:45:10 +02:00
carlarctg 5cbe594e9d Update singularityhammer.dm (#47040) 2019-10-13 19:44:37 +02:00
skoglol d735e0bf36 Yet another debug outfit update (#46982)
About The Pull Request

Less uranium in the material box due to radiation. Suit helmet has had geiger sound reduced to 0, and a manual geiger counter added to the box. Also added a death wand for easier and cleaner killing.
2019-10-13 16:55:39 +13:00
nemvar 62a02f09f1 Medanalyzers are now the tier 2 option for scanning people. (#46917)
About The Pull Request

Removes medical analyzers from medkits.
Removes the ability to print medical scanners from the autolathe.
Why It's Good For The Game

Medical analyzers are currently probably one of the common items in the game. Not only do mappers place them all over their maps but they are also in every medkits, which, funnily enough, are also fucking everywhere.

This leads me what I call the Cobb's Assortment of medical scanner quality:
Tier 1: Ghetto tier. Click your healthdoll, see if you burned for fingers on the kitchen plate.
Tier 2: Normal Analyzers. Somewhat restricted but still fairly common. Almost every department has one but you won't find on randomly in the hallways.
Tier 3: Advanced Analyzers: The shit medbay can print after research, nuff said.
Changelog

cl
balance: Removed health analyzers from medkits. Removed the ability to print health analyzers from autolathes.
/cl
2019-10-13 16:50:12 +13:00
Ghom 2821303c74 Stops non-alphanumeric graffiti decals from being named "letter". (#46979)
About The Pull Request

Does exactly what it says on the tin.
text2ascii accepts text strings with length higher than one character as first arg, so we need to check against that beforehand.
Why It's Good For The Game

Fixing a (likely unreported) mild issue with the game.
Changelog

cl
fix: non-alphanumeric graffiti decals will no longer display as "letter".
/cl
2019-10-13 16:42:35 +13:00
James fffb74bdcf [READY] Welders consume fuel when they destroy an object during attack (#46842)
About The Pull Request

Welders didn't actually consume fuel if their attack deleted an object. This was first noticed when welding space vines, in that the welder didn't consume any fuel to do so. Further testing showed that this was the case for any object that gets destroyed on hit, including APCs, Air Alarms, Girders etc.

Problem was that the code for actually consuming fuel after an attack is in the afterattack proc which doesn't actually get called if the target is QDELETED. PR moves that code to the attack proc, along with (regrettably) implementing attack_obj too. This feels hacky and reeks of duplicate code, so if anyone has a better option for how I could implement this fix I'm all ears.
Why It's Good For The Game

Fixes unintentional behavior
Changelog

cl
fix: Welders now consume fuel when they destroy an object
/cl
2019-10-13 16:41:14 +13:00
Arkatos1 5e47463792 Silicon PDA fix (#46922)
About The Pull Request

This PR makes it so that silicon PDA verbs like toggle ringer are given only to a silicons that actually have one, like AI or pAI. This is also consistent with other similiar silicon items, like silicon camera.
Why It's Good For The Game

Less bugs.
Changelog

cl Arkatos
fix: Only silicons with a valid PDA will now get PDA-related verbs.
/cl
2019-10-13 16:39:00 +13:00
Rob Bailey e1683f674f Merge pull request #46978 from willox/duplicate-variable-stuff
removed a bunch of duplicate member variable definitions and entirely duplicated types
2019-10-12 03:44:15 -07:00
Rob Bailey 0310061f5f Makes the health analyzer's damage list into columns (#46793)
* Makes the health analyzer body part damage list into colums, and other small span fixes.

* Typed list magic fix.

* Adds font face.

* Reformat into a html table and also into a list().
2019-10-12 03:29:46 -07:00
nemvar c38a7a3bb5 Removes a bunch of var/ in procs (#46946)
* Removes a bunch of /var in procs

* reset this

* Why wasn't this already?
2019-10-10 04:20:27 -07:00
ArcaneMusic e7dacc57e4 Adds more functionality to the Medical Kiosk with upgrades. (#46884)
* adds rads upgrades, improves the formatting a bit

* Hey mapmerge want to work this time?

* alright what about now

* sigh

* alright back to standard

* Recompiles tgui

* Box Station map update hopefully?

* Now for the rest of em

* Unintentionally removed an intercom from donut, fixed

* Allows for players to multitool the kiosk board to change the cost to use.

* Alright lets clarify some booleans

* Correctly uses booleans in JS

* Mapp Diff don't be that way

* Update tgstation.dme

dot dme files are cursed and I have proof
2019-10-09 16:09:11 -04:00
Qustinnus 270f73671e fixes mats (#46994) 2019-10-09 20:10:55 +02:00
kingofkosmos 63f6280f44 Reformat into a html table and also into a list(). 2019-10-09 20:55:28 +03:00
Fikou e450be44dc surgery tool refactor (#46856)
* awooooooooooooooooo

* a

* aw shet

* woops!!

* a

* wow heck you
2019-10-09 12:25:42 -04:00
Urumasi 6e7801550b Moves reagent fill code and adds caps to plastic water bottles (#46878)
* Adds caps to plastic bottles

* Non-crafted water bottles now spawned closed

* Added warning message for closed bottles, fixed minor bug

* meme

* Makes the warning only show up when doing valid actions with the bottle

* Clumsy people now have a chance to lose the cap

* Fix small bottle's cap when fallen over, bottles now turn upright when opened on the floor

* Add a minor positive moodlet on bottle flip

* Adds a relic lavaland water bottle that always lands upright

* Moves container fill overlay to reagent_containers, changes glass/beaker/waterbottle to glass/waterbottle

* Make actions with closed cap early return

* Minor code cleanup
2019-10-09 12:05:52 -04:00
81Denton 3863d6b4d5 Fixes spraying/painting over dark paint (#46854)
* Fixes spraying/painting over dark paint

* Blacklists infinite spraycans from pyrite slime extracts
2019-10-08 21:50:09 -07:00
Fikou 3e0e1e9fda chap things now cover what they should (#46866) 2019-10-08 21:47:43 -07:00
William Wallace c688bc39f7 remove duplicate var from /obj/structure/closet/cardboard 2019-10-08 23:25:38 +01:00
William Wallace ea39325ec5 remove duplicate var in /obj/structure/flora/rock/jungle 2019-10-08 23:24:28 +01:00
William Wallace b59c809bd5 remove duplicate var definition in /obj/item/storage/toolbox 2019-10-08 23:23:09 +01:00
William Wallace d83ac45514 remove duplicate /obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle 2019-10-08 23:22:03 +01:00
William Wallace 8221f6de87 remove duplicate var definition in /obj/item/stack/sheet/paperframes 2019-10-08 23:20:33 +01:00
William Wallace 15e5d098af rename dupe icon_state on /obj/item/stack/sheet/animalhide/monkey to item_state (still does not exist) 2019-10-08 23:19:12 +01:00
William Wallace 7f702163f4 remove duplicate var definition in /obj/item/pneumatic_cannon/ghetto 2019-10-08 23:15:32 +01:00
William Wallace 84808b77c4 remove duplicate var definition in /obj/item/toy/plush/slimeplushie 2019-10-08 23:13:32 +01:00
William Wallace 58ebaf07e9 remove duplicate var definition in /obj/structure/checkoutmachine 2019-10-08 23:11:01 +01:00
William Wallace e8a0b723de stray /obj/effect/turf_decal/trimline/brown/filled/end -> /obj/effect/turf_decal/trimline/neutral/filled/end 2019-10-08 23:09:04 +01:00
William Wallace 00a29087d5 remove duplication var definition in /obj/effect/decal/cleanable/blood/tracks 2019-10-08 23:01:20 +01:00
William Wallace 42904e74b4 remove duplicate /obj/item/circuitboard/machine/protolathe/department definition 2019-10-08 22:23:40 +01:00
William Wallace 7017b98d60 remove duplicate /obj/item/circuitboard/machine/protolathe definition 2019-10-08 22:23:00 +01:00
Fikou 714b0ae2f1 the power of the M E D I C A L W R E N C H now makes you glow (#46927)
* awoo

* awoo

* no awoo $50 fine
2019-10-08 23:21:08 +02:00
Qustinnus a394ccdc2b Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) (#46525)
removes materials list from items, uses custom_materials instead. This might introduce some bugs so we should testmerge this for a while (and Ill test stuff locally as much as I can)

this also adds material crafting to sheets. Test case being chairs. In the future we can add stuff like tables, walls, doors etc.

also applies materials to everything, with fixes, which can close #46299
2019-10-08 11:06:02 -04:00
kingofkosmos 71644568b5 Personal interaction messages to simple animals (#46744)
* Adds attacktext2 and friendly2 messages for personal "you" messages in combat.

* Adds response_help2, response_disarm2 and response_harm2 -messages for interacting with simple animals. Also removes unnecessary, already inherited, ones.

* Small extra: Adds personal messages for gun firing.

* Adds personal messages to grabs and fixes shoe stealing messages.

* Fixes open someone else's internals valve pronoun.

* Replaces response_help --> response_help_continuous, response_help2 --> response_help_simple etc. Also adds autodoc to simple_animal.dm variables.
2019-10-07 21:18:42 +02:00
carlarctg d6210b95ce Adds fireproof masks, and tweaks flameproof atmos clothing (#46732)
* the masks

* the startups

* more touchies

* whoops

* actually this is useless

* that's better

* i made a whoopsie boopsie

* bullying is not okay

* should stop coding at 2 am, but i am being a hypcrite now
2019-10-07 10:55:22 -04:00
Rob Bailey b4c34c8b58 Tabling Rework (#46383)
* nutable

* more damage

* halved time

* louder + slightly different sound

* head slam + nerfed table damage

* martial art breaks table + headsmash damages table

* stamina boost to headsmash

* functional table crushing
2019-10-06 19:26:12 -04:00