Lava Dwarves [DNM] by MMMiracles · Pull Request #27155 · tgstation/tgstation

MMMiracles · 2017-05-11T21:53:03Z

🆑 MMMiracles
add: Strange short humanoids have been spotted in the depths of Lavaland, drinking obscene amounts of alcohol and mining precious metals.
/:cl:

[why]: # dorf dorf dorf

Adds dwarves to lavaland. Dig rocks. Beat up the local fauna. Build a mighty fortress to fend off the natives. Drink obscene amounts of alcohol to survive.

Things To Do:

Code-wise

Map-wise

Ruin

Sprite-wise

Pictures

Ruin

Items

KayeArray · 2017-05-11T21:55:06Z

dorf fortress when

MMMiracles · 2017-05-11T21:57:29Z

-				to_chat(user, "<span class='notice'>You finish cutting into the rock.</span>")
-				gets_drilled(user)
-				SSblackbox.add_details("pick_used_mining","[P.type]")
+		var/obj/item/organ/alcoholvessel/dwarf //check to see if the digger has the dwarf organ for increased mining speed


too snowflakey/better method? i dunno.

Nah, checking for the organ makes sense

It's cleaner to put it on the species (Species.dig_speed), I would say, then we can have other species dig quicker too (one of the golem types perhaps?)

yeah but adding even more species vars is excessive

I think the organ system is a superior way to distinguish species personally as it has more interaction depth and potential

@optimumtact so you'd rather access a dwarf only organ here? as opposed to a generic variable?

Honestly this check is a mess

MMMiracles · 2017-05-11T21:59:48Z

+	name = "alcohol stored"
+	screen_loc = ui_alcohol_amount
+
+/obj/screen/dwarf/alcohol_display/proc/update(mob/living/carbon/human/usr)


not actually sure how to call this from the organ, seems to work if i call it in-game via vv menu, though.

You might want to add this to Life() or something.

It would go in the organ's on_life(), not mob Life()

You cannot name the var usr

MMMiracles · 2017-05-11T22:02:00Z

+		owner.adjustFireLoss(-heal_amt)
+		owner.adjustOxyLoss(-heal_amt)
+		owner.adjustCloneLoss(-heal_amt)
+	if(stored_alcohol < 150 > 100 && prob(5))


better way to do this without it being spammy?

it might work with 100 < alcohol < 150

or maybe alcohol in 100 to 150 but i'm not too sure

can you tie it to the alcohol display so like the border or something changes colors [think hunger indicator but with alcohol]

I could pretty easily do that, if I can figure out how to get the organ to show the UI in the first place.

Having it on the status bar or little booze counter (ripping off the aliens counter) could work for a more on screen presence.

What if the user is colorblind?

https://pastebin.com/raw/484ZA43e

I just bullshitted up a non-RNG non-spammy way to do this that may or may not be up to code standards. Honk.

100 < stored_alcohol < 150

would be preferred

francinum · 2017-05-11T22:15:25Z

 // BEGIN_INCLUDE
 #include "_maps\basemap.dm"
-#include "_maps\loadallmaps.dm"
+#include "_maps\runtimestation.dm"


You should never have to uncheck loadallmaps.dm m9

It seems to speed up compile/startup time for me.

XDTM · 2017-05-11T22:20:27Z

+	skinned_type = /obj/item/stack/sheet/animalhide/human
+	brutemod = 0.9
+	coldmod = 0.85
+	punchdamagehigh = 11


this also means higher stunchance, intended?

Dwarves seem like tough little fuckers, so it seemed appropriate that they hit harder.

Fistfighting amongst dwarfs is very dangerous, good change

XDTM · 2017-05-11T22:22:15Z

+/datum/species/dwarf/on_species_loss(mob/living/carbon/C, datum/species/old_species)
+	..()
+	var/mob/living/carbon/human/H = C
+	H.resize = 1.25


Did you test dwarfing -> dwarf mutation -> undwarf -> unmutate? I feel like there may be some resizing issues

I'm working on getting a new set of limbs for dwarves entirely instead of using resize, so this is just temporary until then. Worst comes and I can't get those, I'll just add a check in the dwarfism mutation for the species.

They should probably have morphology checks in that case so that non-dwarves aren't stuck with stubby dwarf legs (unless there's a way to somehow subtract the difference) a similar check is attached to monkeys to stop implanting their wrong proportionate bodies onto humans.

RandomMarine · 2017-05-11T23:46:01Z

+
+/obj/item/organ/alcoholvessel/prepare_eat()
+	var/obj/S = ..()
+	S.reagents.add_reagent("ethonal", stored_alcohol/10)


jughu · 2017-05-12T00:04:58Z

Dwarves vs somewhat orcs (ashwalkers) vs ELVES??(SPOILERS???)

Razharas · 2017-05-12T00:06:26Z

Surely you mean goblins and not orcs

Kromgar · 2017-05-12T02:29:08Z

I swear to fucking god if lava dwarves can not build a fuck the world device i will be very disappointed. Also they need their own speites rather than shrunkrn humans. Also they are all named Urist.

Have dwarves be able to make adamantine... wait you should add adamantine spires

fludd12 · 2017-05-12T02:29:34Z

Surely blacksmithing and brewing will be added to the station, too, right?

...Right?

ghost · 2017-05-12T02:56:32Z

+				if(ismineralturf(src))
+					to_chat(user, "<span class='notice'>You finish cutting into the rock.</span>")
+					gets_drilled(user)
+					SSblackbox.add_details("pick_used_mining","[P.type]")


I suggest you just add something like var/adjusted_digspeed = (user.getorganslot("dwarf_organ") ? (P.digspeed * 0.5) : P.digspeed) and then just change the do_after. You then will not have to duplicate the check, and I don't see why you defined dwarf as an organ, I think it could have just been an ordinary variable, but maybe I am wrong.

ghost · 2017-05-12T02:59:20Z

+	name = "alcohol stored"
+	screen_loc = ui_alcohol_amount
+
+/obj/screen/dwarf/alcohol_display/proc/update(mob/living/carbon/human/usr)


You might want to add this to Life() or something.

ghost · 2017-05-12T03:00:28Z

@@ -0,0 +1,38 @@
+/obj/item/organ/alcoholvessel //essentially the opposite of the xeno's plasmavessel, but with alcohol
+	name = "alcoholvessel"


You definitely want to add this to regenerate_organs()

Metallusions · 2017-05-12T04:27:00Z

I certainly hope they don't hunt down and kill free golems for their precious adamantine or anything. That would be just terrible.

...For the golems.

ShadowDeath6 · 2017-05-12T04:52:57Z

aside from top quality references, what will encourage players to pick dwarves over golems since they fill an extremely similar niche? (mining / building new items from said mined material)

FantasticFwoosh · 2017-05-12T07:28:23Z

Dwarves being a lower tech intermediary i guess, a bit more strapped for materials than the golems who also have the benefit of RnD material duplication & parts. If dwarves & golems can work peacefully it could probably work out well for them both.

See references to them forging new objects.

Pod plant people are probably elves in this respect, growing the stuff, got a lot of brewables to take or trade for, but are very dangerous with the plant varieties (especially by just being shot dead by gatfruit users)

RemieRichards · 2017-05-12T08:05:20Z

+		invisibility  = 0
+		maptext = "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'><font color='magenta'>[round(dwarf.stored_alcohol)]</font></div>"
+
+/obj/screen/dwarf/alcohol_display/proc/remove()


hide(), surely?

RemieRichards · 2017-05-12T08:05:56Z

+/obj/screen/dwarf/alcohol_display/proc/update(mob/living/carbon/human/usr)
+	var/mob/living/carbon/human/H = usr
+	var/obj/item/organ/alcoholvessel/dwarf
+	dwarf = H.getorganslot("dwarf_organ")


Ideally this HUD element would only be created if the person was a dwarf (in the organ's Insert() proc)

FantasticFwoosh · 2017-05-12T08:20:23Z

 ROUNDSTART_RACES lizard
 #ROUNDSTART_RACES fly
 ROUNDSTART_RACES plasmaman
+ROUNDSTART_RACES dwarf


Remember to omit this please

AlexCrimson · 2017-05-12T12:46:21Z

Can we roleplay as Chaos Dwarves and enslave the Miners/filthy Ash Liggers?

FantasticFwoosh · 2017-05-12T12:48:20Z

Id be down for that, i think its no holds barred really about what you want to do with RP, you're just a dwarf from a extranous ASCII dimension which is notorious for having lots of really screwed up people & shit in it.

This is a engraving of a dog, it is on fire.

Dwarves should have a chisel to leave messages & picture graffiti behind with.

Dorsisdwarf · 2017-05-12T13:24:11Z

There should be a goblin dark fortress ruin which only spawns if the dwarf ruin does, and then sends tunneling simplemobs after the dwarves

FantasticFwoosh · 2017-05-12T13:26:39Z

I think ashwalkers suffice the nessecary low tech & envious antagonist to dwarves between fighting the dwarves might pick versus the station or other mining lavaland roles. It'd be interesting to have a Master - Slave ghost role though, with one non-antag true demon ruling over some underlings or some kind of arrangement like that.

When did we become a DFortress tribute game?

Iamgoofball · 2017-05-23T23:17:21Z

 	// THESE OVERRIDE THE HIDEHAIR FLAGS
 	var/dynamic_hair_suffix = ""//head > mask for head hair
 	var/dynamic_fhair_suffix = ""//mask > head for facial hair
-	var/greyscale = FALSE


dude you removed all the stuff to make sure that armors reflect their material color

I was under the assumption that equipping it was enough to make sure the neccesary icon updates worked and gave it the proper coloring, at least from what I understood from Remie's earlier comment.

Yes, clothing images inherit the .color of the item they came from, so if the inventory item is greyscale (it should be), then the worn will automatically be too.

Iamgoofball · 2017-05-23T23:17:44Z

 	result = /obj/item/clothing/head/helmet/dwarf
-	reqs = list(/obj/item/weapon/grown/log = 1,
-				/obj/item/weapon/mold_result/helmet_plating = 1)
+	reqs = list(/obj/item/stack/sheet/leather = 2,


Do they even have access to leather?

I was wrong in assuming cat's butcher_result gave their respective hide, but that's a super easy fix so technically they will as soon as I add that. They have the puddle for wetting and can make a drying rack so leather should be more than feasible as long as they don't kill off all their livestock.

lmao is that the point of the catsplosion

ahahahaha

ChangelingRain · 2017-05-24T04:17:17Z

+	mineralType = /obj/item/stack/sheet/mineral/clay
+	spreadChance = 20
+	spread = 1
+	scan_state = "rock_clay"


scan states need to go in ore_visuals.dmi now, and they must be centered.

RemieRichards · 2017-05-24T07:47:30Z

 	var/siemens_coeff = 1 //base electrocution coefficient
 	var/damage_overlay_type = "human" //what kind of damage overlays (if any) appear on our species when wounded?
 	var/fixed_mut_color = "" //to use MUTCOLOR with a fixed color that's independent of dna.feature["mcolor"]
+	var/list/species_clothing_blacklist //If you're in this list, you can't wear it


these don't go on the species, they go on the clothing (like I told you too, and like you actually did (??))

RemieRichards · 2017-05-24T07:48:23Z

+	heat_protection = CHEST|GROIN|ARMS
+	armor = list(melee = 50, bullet = 10, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 80)
+	strip_delay = 80
+	put_on_delay = 60


all of these dwarf clothes need:
species_whitelist = list("dwarf")
so that they're dwarf only.

RemieRichards · 2017-05-24T12:47:36Z

 		P.playDigSound()

-		if(do_after(user,P.digspeed, target = src))
+		var/adjusted_digspeed = (user.getorganslot("dwarf_organ") ? (P.digspeed * 0.5) : P.digspeed)


Still not happy with this.
Prefer some kind of proc on the mob, that by default returns 0, then you can do:

var/udigspeed = user.get_digspeed() //Eg: 0.5, 1, 2 var/adjusted_digspeed = udigspeed ? (P.digspeed * udigspeed) : P.digspeed

The human version of this proc can then check for the dwarf organ.

RemieRichards · 2017-05-24T12:55:47Z

 	// THESE OVERRIDE THE HIDEHAIR FLAGS
 	var/dynamic_hair_suffix = ""//head > mask for head hair
 	var/dynamic_fhair_suffix = ""//mask > head for facial hair
+	var/my_clothing_icon = 'icons/mob/uniform.dmi'


This doesn't need to exist, it was only for greyscaling which is already handled automatically by human update_icons() code.

FantasticFwoosh · 2017-05-24T18:03:13Z

Remove the colon grass please from floors since we are not using it, unless you have a forseeable use for it in future it should probably be shelved. Also delivered more sprites so expect a commit at sometime to break everything once again.

optimumtact · 2017-05-26T06:59:01Z

silicons · 2017-05-26T07:01:30Z

include me in the screenshot

silicons · 2017-05-26T07:13:31Z

yes

RandomMarine · 2017-05-26T07:16:08Z

I think goofy references fit the overall game theme better than super serious tactical military operators operating operationally in fields of operations.

Bawhoppen · 2017-05-26T07:20:43Z

@RandomMarine there's a time for everything and a place for it all to fit in this game,
also funny seeing you say that considering your username

Steelpoint · 2017-05-26T07:22:58Z

I thought one of the draws to SS13 is the stark contrast between pretty sane, serious things and the wacky and nonsensical.

TGxSingularity · 2017-05-26T17:13:02Z

Adamantine for mat 8 seems a little too much.

Iamgoofball · 2017-05-26T17:17:39Z

will fix all this tonight

MMMiracles · 2017-05-27T16:22:55Z

Busy working on other things so @Iamgoofball is taking the reins on this at #27761

Iamgoofball · 2017-05-27T16:34:50Z

can you send me a copy of the OP from this

KayeArray · 2017-05-27T19:36:57Z

DORF NOOOOOOOO

MMMiracles added 3 commits May 11, 2017 06:33

dwarves pt1

c5f11e9

dorf!

6c38cff

migrant

a516835

tgstation-server added Do Not Merge You must have really upset someone Map Edit Feature Exposes new bugs in interesting ways labels May 11, 2017

MMMiracles commented May 11, 2017

View reviewed changes

forgot the organ WOOPS

60f3cd0

MMMiracles commented May 11, 2017

View reviewed changes

francinum reviewed May 11, 2017

View reviewed changes

XDTM reviewed May 11, 2017

View reviewed changes

RandomMarine reviewed May 11, 2017

View reviewed changes

ghost reviewed May 12, 2017

View reviewed changes

RemieRichards reviewed May 12, 2017

View reviewed changes

FantasticFwoosh reviewed May 12, 2017

View reviewed changes

tgstation-server removed the Merge Conflict Adding upstream files to your repo via drag and drop won't resolve conflicts label May 23, 2017

Iamgoofball reviewed May 23, 2017

View reviewed changes

ChangelingRain reviewed May 24, 2017

View reviewed changes

RemieRichards reviewed May 24, 2017

View reviewed changes

lzimann added the Merge Conflict Adding upstream files to your repo via drag and drop won't resolve conflicts label May 24, 2017

optimumtact closed this May 26, 2017

optimumtact reopened this May 26, 2017

optimumtact closed this May 26, 2017

optimumtact reopened this May 26, 2017

optimumtact closed this May 26, 2017

optimumtact reopened this May 26, 2017

FantasticFwoosh mentioned this pull request May 26, 2017

Fixes legion icon #27698

Merged

MMMiracles closed this May 27, 2017

GunHog mentioned this pull request Aug 13, 2017

[rEADy} Lavaland Dwarves #29833

Closed

		@@ -0,0 +1,38 @@
		/obj/item/organ/alcoholvessel //essentially the opposite of the xeno's plasmavessel, but with alcohol
		name = "alcoholvessel"

Conversation

MMMiracles commented May 11, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

KayeArray commented May 11, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

RemieRichards May 12, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

FantasticFwoosh May 12, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

RandomMarine May 12, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Cyberboss May 12, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jughu commented May 12, 2017

Uh oh!

Razharas commented May 12, 2017

Uh oh!

Kromgar commented May 12, 2017

Uh oh!

MMMiracles commented May 11, 2017 •

edited

Loading

RemieRichards May 12, 2017 •

edited

Loading

FantasticFwoosh May 12, 2017 •

edited

Loading

RandomMarine May 12, 2017 •

edited

Loading

Cyberboss May 12, 2017 •

edited

Loading

FantasticFwoosh commented May 12, 2017 •

edited

Loading

FantasticFwoosh May 12, 2017 •

edited

Loading

FantasticFwoosh commented May 12, 2017 •

edited

Loading

FantasticFwoosh commented May 12, 2017 •

edited

Loading