shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

under 100 now

Browse Source
This commit is contained in:
Metis
2024-09-13 16:25:53 -04:00
parent cb6a43a7bf
commit f9bfd0d3f0
29 changed files with 359 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hyperstation/code/mobs/hugbot.dm
+3 -3
View File
@@ -52,7 +52,7 @@
update_icon()
/mob/living/simple_animal/bot/hugbot/update_canmove()
/mob/living/simple_animal/bot/hugbot/update_mobility()
. = ..()
update_icon()
@@ -253,11 +253,11 @@
C.adjustStaminaLoss(-15)
else if(resting)
C.resting = 0
C.update_canmove()
C.update_mobility()
else
C.Knockdown(100)
C.Stun(100)
C.update_canmove()
C.update_mobility()
playsound(C.loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
hyperstation/code/modules/antagonists/wendigo/mob/metabolization.dm
+8 -8
View File
@@ -2,24 +2,24 @@
/mob/living/carbon/wendigo/proc/metabolize_hunger()
if(HAS_TRAIT(src, TRAIT_NOHUNGER))
return
if(connected_link)
if(connected_link.souls.len > 3)
nutrition = min(800, nutrition + (HUNGER_FACTOR*connected_link.souls.len))
nutrition = max(0, nutrition - (HUNGER_FACTOR / (physiology.hunger_mod / (connected_link.souls.len + 1))))
else
nutrition = max(0, nutrition - (HUNGER_FACTOR / physiology.hunger_mod))
switch(nutrition)
if(NUTRITION_LEVEL_WELL_FED to INFINITY)
throw_alert("nutrition", /obj/screen/alert/full)
throw_alert("nutrition", /atom/movable/screen/alert/full)
if(NUTRITION_LEVEL_HUNGRY to NUTRITION_LEVEL_FED)
throw_alert("nutrition", /obj/screen/alert/sated)
throw_alert("nutrition", /atom/movable/screen/alert/sated)
if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_HUNGRY)
throw_alert("nutrition", /obj/screen/alert/hungry)
throw_alert("nutrition", /atom/movable/screen/alert/hungry)
if(0 to NUTRITION_LEVEL_STARVING)
throw_alert("nutrition", /obj/screen/alert/starving)
throw_alert("nutrition", /atom/movable/screen/alert/starving)
/mob/living/carbon/wendigo/reagent_check(datum/reagent/R)
if(istype(R, /datum/reagent/fermi))
var/had_changed = FALSE
@@ -35,7 +35,7 @@
if(R.type == /datum/reagent/fermi/BEsmaller)
fake_breast_size = max(0, fake_breast_size - 0.25)
had_changed = "BEsmaller"
if(had_changed)
R.volume -= R.metabolization_rate
if(round(fake_penis_size, 1) == fake_penis_size && fake_penis_size)
hyperstation/code/modules/antagonists/wendigo/mob/mob_defense.dm
+10 -10
View File
@@ -17,13 +17,13 @@
if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT && !HAS_TRAIT(src, TRAIT_RESISTHEAT))
switch(bodytemperature)
if(280 to 300)
throw_alert("temp", /obj/screen/alert/hot, 1)
throw_alert("temp", /atom/movable/screen/alert/hot, 1)
apply_damage(HEAT_DAMAGE_LEVEL_1*physiology.heat_mod, BURN)
if(300 to 350)
throw_alert("temp", /obj/screen/alert/hot, 2)
throw_alert("temp", /atom/movable/screen/alert/hot, 2)
apply_damage(HEAT_DAMAGE_LEVEL_2*physiology.heat_mod, BURN)
if(350 to INFINITY)
throw_alert("temp", /obj/screen/alert/hot, 3)
throw_alert("temp", /atom/movable/screen/alert/hot, 3)
if(on_fire)
apply_damage(HEAT_DAMAGE_LEVEL_3*physiology.heat_mod, BURN)
else
@@ -33,13 +33,13 @@
if(!istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell))
switch(bodytemperature)
if(200 to 260)
throw_alert("temp", /obj/screen/alert/cold, 1)
throw_alert("temp", /atom/movable/screen/alert/cold, 1)
apply_damage(COLD_DAMAGE_LEVEL_1*physiology.cold_mod, BURN)
if(0 to 120)
throw_alert("temp", /obj/screen/alert/cold, 2)
throw_alert("temp", /atom/movable/screen/alert/cold, 2)
apply_damage(COLD_DAMAGE_LEVEL_2*physiology.cold_mod, BURN)
if(-INFINITY to 0)
throw_alert("temp", /obj/screen/alert/cold, 3)
throw_alert("temp", /atom/movable/screen/alert/cold, 3)
apply_damage(COLD_DAMAGE_LEVEL_3*physiology.cold_mod, BURN)
else
clear_alert("temp")
@@ -54,16 +54,16 @@
switch(adjusted_pressure)
if(HAZARD_HIGH_PRESSURE to INFINITY)
adjustBruteLoss(min((((adjusted_pressure / HAZARD_HIGH_PRESSURE)-1)*PRESSURE_DAMAGE_COEFFICIENT)*physiology.pressure_mod, MAX_HIGH_PRESSURE_DAMAGE))
throw_alert("pressure", /obj/screen/alert/highpressure, 2)
throw_alert("pressure", /atom/movable/screen/alert/highpressure, 2)
if(WARNING_HIGH_PRESSURE to HAZARD_HIGH_PRESSURE)
throw_alert("pressure", /obj/screen/alert/highpressure, 1)
throw_alert("pressure", /atom/movable/screen/alert/highpressure, 1)
if(WARNING_LOW_PRESSURE to WARNING_HIGH_PRESSURE)
clear_alert("pressure")
if(HAZARD_LOW_PRESSURE to WARNING_LOW_PRESSURE)
throw_alert("pressure", /obj/screen/alert/lowpressure, 1)
throw_alert("pressure", /atom/movable/screen/alert/lowpressure, 1)
else
adjustBruteLoss( LOW_PRESSURE_DAMAGE*physiology.pressure_mod )
throw_alert("pressure", /obj/screen/alert/lowpressure, 2)
throw_alert("pressure", /atom/movable/screen/alert/lowpressure, 2)
return
hyperstation/code/modules/arousal/arousalhud.dm
+5 -5
View File
@@ -130,7 +130,7 @@
V.toggle_visibility(picked_visibility)
if(href_list["hidebreasts"])
var/obj/item/organ/genital/breasts/B = usr.getorganslot("breasts")
var/obj/item/organ/genital/breasts/B = usr.getorganslot(ORGAN_SLOT_BREASTS)
var/picked_visibility = input(usr, "Choose visibility", "Expose/Hide genitals", "Hidden by clothes") in list("Always visible", "Hidden by clothes", "Always hidden")
B.toggle_visibility(picked_visibility)
@@ -140,7 +140,7 @@
E.toggle_visibility(picked_visibility)
if(href_list["hideanus"])
var/obj/item/organ/genital/anus/A = usr.getorganslot("anus")
var/obj/item/organ/genital/butt/A = usr.getorganslot(ORGAN_SLOT_BUTT)
var/picked_visibility = input(usr, "Choose visibility", "Expose/Hide genitals", "Hidden by clothes") in list("Always visible", "Hidden by clothes", "Always hidden")
A.toggle_visibility(picked_visibility)
@@ -262,7 +262,7 @@
O.equipment = null
if(href_list["removeequipmentbreasts"])
var/obj/item/organ/genital/breasts/O = usr.getorganslot("breasts")
var/obj/item/organ/genital/breasts/O = usr.getorganslot(ORGAN_SLOT_BREASTS)
var/obj/item/I = O.equipment
usr.put_in_hands(I)
O.equipment = null
@@ -284,7 +284,7 @@
O.equipment = null
if(href_list["removeequipmentanus"])
var/obj/item/organ/genital/anus/O = usr.getorganslot("anus")
var/obj/item/organ/genital/butt/O = usr.getorganslot(ORGAN_SLOT_BUTT)
var/obj/item/I = O.equipment
usr.put_in_hands(I)
O.equipment = null
@@ -630,7 +630,7 @@ obj/screen/arousal/proc/feedyourself()
picked_organ = input(src, "with what?", "Climax", null) as null|obj in genitals_list
else
return
if(picked_organ)
//Good, got an organ, time to pick a container
if(picked_organ.name == "penis")//if the select organ is a penis
hyperstation/code/modules/integrated_electronics/input.dm
+2 -2
View File
@@ -28,7 +28,7 @@
return
var/obj/item/organ/genital/penis/P = L.getorganslot("penis")
var/obj/item/organ/genital/breasts/B = L.getorganslot("breasts")
var/obj/item/organ/genital/breasts/B = L.getorganslot(ORGAN_SLOT_BREASTS)
var/obj/item/organ/genital/testicles/T = L.getorganslot("testicles")
//reset data, just incase they dont have that genitle
@@ -77,4 +77,4 @@
set_pin_data(IC_OUTPUT, 2, L.breedable)
push_data()
activate_pin(2)
*/
*/
hyperstation/code/modules/resize/resizing.dm
+3 -3
View File
@@ -120,7 +120,7 @@
return TRUE
if(abs(get_effective_size()/tmob.get_effective_size()) >= 2)
if(H.a_intent == "disarm" && H.canmove && !H.buckled)
if(H.a_intent == "disarm" && CHECK_MOBILITY(H, MOBILITY_MOVE) && !H.buckled)
now_pushing = 0
H.forceMove(tmob.loc)
sizediffStamLoss(tmob)
@@ -147,7 +147,7 @@
return TRUE
* commenting out for now.*/
if(H.a_intent == "harm" && H.canmove && !H.buckled)
if(H.a_intent == "harm" && CHECK_MOBILITY(H, MOBILITY_MOVE) && !H.buckled)
now_pushing = 0
H.forceMove(tmob.loc)
sizediffStamLoss(tmob)
@@ -177,7 +177,7 @@
commenting out for now */
return TRUE
// if(H.a_intent == "grab" && H.canmove && !H.buckled)
// if(H.a_intent == "grab" && CHECK_MOBILITY(H, MOBILITY_MOVE) && !H.buckled)
// now_pushing = 0
// H.forceMove(tmob.loc)
// sizediffStamLoss(tmob)
hyperstation/code/obj/leash.dm
+6 -6
View File
@@ -14,9 +14,9 @@ Icons, maybe?
/datum/status_effect/leash_dom
status_type = STATUS_EFFECT_UNIQUE
alert_type = /obj/screen/alert/status_effect/leash_dom
alert_type = /atom/movable/screen/alert/status_effect/leash_dom
/obj/screen/alert/status_effect/leash_dom
/atom/movable/screen/alert/status_effect/leash_dom
name = "Leash Master"
desc = "You've got a leash, and a cute pet on the other end."
icon_state = "leash_master" //These call icons that don't exist, so no icon comes up. Which is good.
@@ -24,9 +24,9 @@ Icons, maybe?
/datum/status_effect/leash_freepet
status_type = STATUS_EFFECT_UNIQUE
alert_type = /obj/screen/alert/status_effect/leash_freepet
alert_type = /atom/movable/screen/alert/status_effect/leash_freepet
/obj/screen/alert/status_effect/leash_freepet
/atom/movable/screen/alert/status_effect/leash_freepet
name = "Escaped Pet"
desc = "You're on a leash, but you've no master. If anyone grabs the leash they'll gain control!"
icon_state = "leash_freepet"
@@ -36,9 +36,9 @@ Icons, maybe?
id = "leashed"
status_type = STATUS_EFFECT_UNIQUE
var/mob/redirect_component
alert_type = /obj/screen/alert/status_effect/leash_pet
alert_type = /atom/movable/screen/alert/status_effect/leash_pet
/obj/screen/alert/status_effect/leash_pet
/atom/movable/screen/alert/status_effect/leash_pet
name = "Leashed Pet"
desc = "You're on the hook now! Be good for your master."
icon_state = "leash_pet"