Medihound Fixes (#3462)

* fix borgs, tries new things

* TGUI experiment, Expanded resist

also cleans up some bad code we don't want to keep

* kinda important to have the right one

* I actually managed to compile tgui

* tgui fuckery

I hate UI building

* more tgui tweaks

and it finally compiles, again.

* Have I mentioned UIs are not my strong point?

Because they're really not

* updates to this shit thing.

Tgui button chem selection -> chem to inject needs to be fixed

* No.

* FUCKING, FINALLY
This commit is contained in:
Poojawa
2017-10-21 06:15:50 -05:00
committed by GitHub
parent 2dfbdaff30
commit 7b8e88ec7e
7 changed files with 287 additions and 270 deletions
+11 -1
View File
@@ -59,6 +59,8 @@
return ONE_ATMOSPHERE
if(ismob(loc))
return ONE_ATMOSPHERE
if(istype(loc, /obj/item/device/dogborg/sleeper))
return ONE_ATMOSPHERE
else
return pressure
@@ -133,6 +135,12 @@
/mob/living/carbon/human/proc/get_thermal_protection()
var/thermal_protection = 0 //Simple check to estimate how protected we are against multiple temperatures
if(istype(loc, /obj/item/device/dogborg/sleeper))
return FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
if(ismob(loc))
return FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
if(wear_suit)
if(wear_suit.max_heat_protection_temperature >= FIRE_SUIT_MAX_TEMP_PROTECT)
thermal_protection += (wear_suit.max_heat_protection_temperature*0.7)
@@ -244,7 +252,9 @@
if(dna && (RESISTCOLD in dna.species.species_traits))
return 1
if(istype(loc, /obj/item/device/dogborg/sleeper))
return 1 //freezing to death in sleepers ruins fun.
if(ismob(loc))
return 1 //because lazy and being inside somemone insulates you from space
@@ -387,9 +387,9 @@
/obj/item/device/analyzer/nose,
/obj/item/soap/tongue,
/obj/item/device/healthanalyzer,
/obj/item/device/dogborg/sleeper,
/obj/item/device/dogborg/sleeper/medihound,
/obj/item/twohanded/shockpaddles/hound,
/obj/item/reagent_containers/borghypo,
/obj/item/stack/medical/gauze/cyborg,
/obj/item/device/sensor_device)
emag_modules = list(/obj/item/dogborg/pounce)
ratvar_modules = list(/obj/item/clockwork/slab/cyborg/medical,
+14
View File
@@ -137,6 +137,7 @@
M.forceMove(owner.loc) // Move the belly contents into the same location as belly's owner.
M << sound(null, repeat = 0, wait = 0, volume = 80, channel = CHANNEL_PREYLOOP)
src.internal_contents.Remove(M) // Remove from the belly contents
var/datum/belly/B = check_belly(owner)
if(B)
B.internal_contents.Add(M)
@@ -394,6 +395,19 @@
if(!silent)
for(var/mob/hearer in range(1,owner))
hearer << sound(target.vore_sound,volume=80)
/*
//Handles creation of temporary 'vore chest' upon digestion
/datum/belly/proc/slimy_mass(var/obj/item/content, var/mob/living/M)
if(!content in internal_contents)
return
internal_contents += new /obj/structure/closet/crate/vore(src)
internal_contents.Remove(content)
M.transferItemToLoc(content, /obj/structure/closet/crate/vore)
if(!M.transferItemToLoc(W))
qdel(W)
/datum/belly/proc/regurgitate_items(var/obj/structure/closet/crate/vore/C)
*/
// Belly copies and then returns the copy
// Needs to be updated for any var changes
+22
View File
@@ -0,0 +1,22 @@
/obj/item/restraints/handcuffs/cable/vorecuffs
name = "vorecuffs"
desc = "Because Poojawa is at a loss for actually making people stop being muppets during vore."
icon_state = "vorecuffs"
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
materials = list()
breakouttime = 20 //Deciseconds = 2s
trashtype = /obj/item/restraints/handcuffs/cable/vorecuffs/used
/obj/item/restraints/handcuffs/cable/vorecuffs/used
desc = "You don't see this coder related vore trick."
icon_state = "vorecuffs_used"
item_state = "vorecuffs"
/obj/item/restraints/handcuffs/cable/vorecuffs/used/attack()
return
/obj/structure/closet/crate/vore
name = "Slimy ooze"
desc = "A mass of ooze, with something within"
icon_state = "vore_ooze"