[MIRROR] Xenoarch Rework [Ready for Review] (#9951)

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-01-27 01:07:01 +01:00
committed by GitHub
co-authored by Cameron Lennox Kashargul
parent 0c114ce5d3
commit ab1a8177ff
88 changed files with 2178 additions and 1363 deletions
@@ -477,12 +477,6 @@
BD.unwrap()
open()
/obj/structure/closet/proc/animate_shake()
var/init_px = pixel_x
var/shake_dir = pick(-1, 1)
animate(src, transform=turn(matrix(), 8*shake_dir), pixel_x=init_px + 2*shake_dir, time=1)
animate(transform=null, pixel_x=init_px, time=6, easing=ELASTIC_EASING)
/obj/structure/closet/onDropInto(var/atom/movable/AM)
return
@@ -70,7 +70,8 @@
/obj/item/clothing/glasses/science,
/obj/item/radio/headset/headset_sci,
/obj/item/storage/belt/archaeology,
/obj/item/storage/excavation)
/obj/item/storage/excavation,
/obj/item/pickaxe/excavationdrill)
/obj/structure/closet/excavation
name = "Excavation tools"
+5 -5
View File
@@ -1,7 +1,7 @@
/obj/structure/fitness
icon = 'icons/obj/stationobjs.dmi'
anchored = TRUE
var/being_used = 0
var/fitness_being_used = 0
var/weightloss_power = 1
/obj/structure/fitness/punchingbag
@@ -55,11 +55,11 @@
if(user.weight < 70) //CHOMPAdd Begin Add weight loss to old fitness equipment
to_chat(user, span_notice("You're too skinny to risk losing any more weight!"))
return //CHOMPAdd End
if(being_used)
if(fitness_being_used)
to_chat(user, span_warning("The weight machine is already in use by somebody else."))
return
else
being_used = 1
fitness_being_used = 1
playsound(src, 'sound/effects/weightlifter.ogg', 50, 1)
user.set_dir(SOUTH)
flick("[icon_state]_[weight]", src)
@@ -69,7 +69,7 @@
var/weightloss_enhanced = weightloss_power * (weight * 0.5)
user.weight -= 0.25 * weightloss_enhanced * (0.01 * user.weight_loss)
to_chat(user, span_notice("You lift the weights [qualifiers[weight]]."))
being_used = 0
fitness_being_used = 0
else
to_chat(user, span_notice("Against your previous judgement, perhaps working out is not for you."))
being_used = 0
fitness_being_used = 0
+11 -6
View File
@@ -9,7 +9,7 @@
layer = TABLE_LAYER
explosion_resistance = 1
var/health = 10
var/destroyed = 0
var/destroyed = FALSE
/obj/structure/grille/ex_act(severity)
@@ -60,7 +60,7 @@
//Flimsy grilles aren't so great at stopping projectiles. However they can absorb some of the impact
var/damage = Proj.get_structure_damage()
var/passthrough = 0
var/passthrough = FALSE
if(!damage) return
@@ -72,15 +72,15 @@
if(Proj.original == src || prob(20))
Proj.damage *= between(0, Proj.damage/60, 0.5)
if(prob(max((damage-10)/25, 0))*100)
passthrough = 1
passthrough = TRUE
else
Proj.damage *= between(0, Proj.damage/60, 1)
passthrough = 1
passthrough = TRUE
if(BURN)
//beams and other projectiles are either blocked completely by grilles or stop half the damage.
if(!(Proj.original == src || prob(20)))
Proj.damage *= 0.5
passthrough = 1
passthrough = TRUE
if(passthrough)
. = PROJECTILE_CONTINUE
@@ -221,7 +221,7 @@
// Used in mapping to avoid
/obj/structure/grille/broken
destroyed = 1
destroyed = TRUE
icon_state = "grille-b"
density = FALSE
@@ -283,6 +283,11 @@
return FALSE
*/
/obj/structure/grille/occult_act(mob/living/user)
new /obj/structure/grille/cult(get_turf(src))
qdel(src)
return TRUE
/obj/structure/grille/take_damage(var/damage)
health -= damage
spawn(1) healthcheck()