Changes to protean PR (#1)

* Removes darkvision

Removes dark vision changes

* Prevents rig assimilation and allows vent crawl for small items only

Removed the ability to assimilate rigs.

Added the ability to vent crawl back, but it now checks their inventory (including inside the rig storage) for any items over pocket-size.

* Removed unnecessary exception

* 1 -> TRUE and 2 -> ITEMSIZE_SMALL
This commit is contained in:
SatinIsle
2024-11-15 20:41:55 +01:00
committed by GitHub
parent d0b9872e70
commit fa6566a42c
6 changed files with 35 additions and 4 deletions
@@ -15,7 +15,6 @@
harm_intent_damage = 3
melee_damage_lower = 5
melee_damage_upper = 5
see_in_dark = 10
player_msg = "You're a little squisher! Your cuteness level has increased tenfold."
heat_damage_per_tick = 20 // Hot and cold are bad, but cold is AS bad for prommies as it is for slimes.
cold_damage_per_tick = 20
@@ -24,7 +24,6 @@
melee_damage_lower = 5
melee_damage_upper = 5
attacktext = list("slashed")
see_in_dark = 10
min_oxy = 0
max_oxy = 0
@@ -74,6 +73,7 @@
humanform = H
updatehealth()
refactory = locate() in humanform.internal_organs
add_verb(src,/mob/living/proc/ventcrawl)
add_verb(src,/mob/living/proc/usehardsuit)
add_verb(src,/mob/living/simple_mob/protean_blob/proc/nano_partswap)
add_verb(src,/mob/living/simple_mob/protean_blob/proc/nano_regenerate)
@@ -28,6 +28,7 @@
//ai_interface_path = "RIGSuit_protean"
var/sealed = 0
var/assimilated_rig
var/can_assimilate_rig = FALSE
/obj/item/rig/protean/relaymove(mob/user, var/direction)
if(user.stat || user.stunned)
@@ -491,6 +492,9 @@
//Effectively a round about way of letting a Protean wear other rigs.
/obj/item/rig/protean/proc/AssimilateRig(mob/user, var/obj/item/rig/R)
if(!can_assimilate_rig)
to_chat(user, span_warning("You can not place a rig into \the [src]"))
return
if(!R || assimilated_rig)
return
if(istype(R, /obj/item/rig/protean))
@@ -40,7 +40,6 @@
max_age = 200
oxy_mod = 0
//radiation_mod = 0 //Can't be assed with fandangling rad protections while blob formed/suited
darksight = 10
siemens_coefficient = 2
brute_mod = 0.8
burn_mod = 1.5
+5
View File
@@ -613,6 +613,11 @@
L += D.wrapped
if(istype(D.wrapped, /obj/item/storage)) //this should never happen
L += get_contents(D.wrapped)
for(var/obj/item/rig/R in src.contents) //Check rigsuit storage for items
if(R.rig_storage)
L += get_contents(R.rig_storage)
return L
/mob/living/proc/check_contents_for(A)