Commit Graph

12513 Commits

Author SHA1 Message Date
81Denton
85ee636d41 Merge pull request #47198 from kingofkosmos/healthanalyzer_ceilingfix
Makes the health analyzer round the damage values up
2019-10-20 14:18:46 +02:00
ArcaneMusic
e8160371a7 Adds the Cleric's Den ruin, and Datum Maces. (#46915)
* REWROTE EVERYTHING

* And these too

* Mapmerger as usual

* Qust changed some datum mat stuff, fixed

* Updated the rune sprite to be in-line with blood cult style runes.

* Uses a less degenerate sprite for the rune
2019-10-20 00:24:58 -04:00
Tony
2f8ef2f725 fixes not being able to access medical first aid kits inside a bag (#47155) 2019-10-19 21:42:17 -04:00
spookydonut
4e8ff18b07 Fix Travis grep script to use PCRE to actually match things (#47065)
Several of the greps were missing the `-P` switch which caused them to 
fail to match things. The EOL grep also wasn't working right so I 
replaced it with the one I added to TGMC.
2019-10-19 10:21:05 -07:00
Fikou
d61384ce84 adds bronze windows and airlocks (#46921)
* bronze windows

* awoo

* badoom

* bronze airlock

* awoo

* nice

* oof
2019-10-18 20:11:27 -04:00
Qustinnus
b021210a2f [READY] Adds a basic skill framework to Physiology. (Only applied to mining) (#46913)
* levels

* mining

* ore exp

* fixes

* epic

* Update code/game/turfs/simulated/minerals.dm

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

* fixes message

* dumb

* shreet

* epic

* fix

* ass

* scrape

* fixes bugs

* fixes

* reset

* test

* ??

* ok bye

* fix

* Adds skills

* skill
2019-10-18 19:59:35 -04:00
moo
940606a239 Adds new bioluminescent traits and mutations (#46986)
* Adds new bioluminescent traits and mutations

Because 'puke green' shouldn't be the only light color.

* Adds new bioluminescent traits and mutations

Because 'puke green' shouldn't be the only light color.

* Adds new bioluminescent traits and mutations

Because 'puke green' shouldn't be the only light color.
2019-10-18 19:49:24 -04:00
Yaki
46d57ae96a Skeletons Can No Longer Be Hugged By Facehuggers: Take 2 (#46959)
* creates the xeno immunity trait for skeletons

* creates globalvar for xeno immmunity

* gives skeletons the xeno immunity trait

* makes the hugger check for xeno immunity

* checks for xeno immunity trait over embryo and hivenode

* adds the xeno immunity trait with hivenode

* adds xeno immunity trait when impregnated

* whoops fixed the number of macro args

* okay NOW it should be fixed

* there now it should b gucci
2019-10-18 19:46:13 -04:00
81Denton
6e4996e6e3 Merge pull request #47157 from Time-Green/plunger-masks
Adds plunger unicorns
2019-10-19 01:24:02 +02:00
kingofkosmos
cd0ddd0b75 Makes the health analyzer round the damage values up. 2019-10-18 21:09:55 +03:00
Qustinnus
472dd167ac fixes orm not giving mats and rods not having mats (#47163)
* o ok

* ok
2019-10-18 19:19:59 +02:00
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
Time-Green
57993f9a7c thanks vscode, very cool! 2019-10-17 13:55:18 +02:00
Time-Green
53457de5aa adds plunger unicorns 2019-10-17 13:44:50 +02: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
nianjiilical
434bba9775 Adds new bioluminescent traits and mutations
Because 'puke green' shouldn't be the only light color.
2019-10-10 18:05:01 -03: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