mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com>
This commit is contained in:
@@ -393,8 +393,9 @@
|
||||
// Copied from /obj/machinery/computer/supplycomp/ui_interact(),
|
||||
// code\game\machinery\computer\supply.dm, starting at line 55
|
||||
/obj/item/commcard/proc/get_supply_shuttle_status()
|
||||
var/shuttle_status[0]
|
||||
var/list/shuttle_status = list()
|
||||
var/datum/shuttle/autodock/ferry/supply/shuttle = SSsupply.shuttle
|
||||
|
||||
if(shuttle)
|
||||
if(shuttle.has_arrive_time())
|
||||
shuttle_status["location"] = "In transit"
|
||||
@@ -445,7 +446,7 @@
|
||||
shuttle_status["engine"] = "Engaged"
|
||||
|
||||
else
|
||||
shuttle["mode"] = SUP_SHUTTLE_ERROR
|
||||
shuttle_status["mode"] = SUP_SHUTTLE_ERROR
|
||||
|
||||
return shuttle_status
|
||||
|
||||
|
||||
@@ -272,11 +272,7 @@
|
||||
|
||||
//Checks for various conditions to see if the mob is revivable
|
||||
/obj/item/shockpaddles/proc/can_defib(mob/living/carbon/human/H) //This is checked before doing the defib operation
|
||||
//CHOMPEdit Begin - Vox can be revived with jumper cables
|
||||
if(H.get_species() == SPECIES_VOX && use_on_synthetic)
|
||||
// Will silently continue to the other two checks.
|
||||
//CHOMPEdit End - Edit included the else on the next line.
|
||||
else if((H.species.flags & NO_DEFIB))
|
||||
if((H.species.flags & NO_DEFIB))
|
||||
return "buzzes, \"Incompatible physiology. Operation aborted.\""
|
||||
else if(H.isSynthetic() && !use_on_synthetic)
|
||||
return "buzzes, \"Synthetic Body. Operation aborted.\""
|
||||
|
||||
@@ -195,7 +195,7 @@
|
||||
H.eye_blurry = max(H.eye_blurry, flash_strength + 5)
|
||||
H.flash_eyes()
|
||||
H.adjustHalLoss(halloss_per_flash * (flash_strength / 5)) // Should take four flashes to stun.
|
||||
H.apply_damage(flash_strength * H.species.flash_burn/5, BURN, BP_HEAD, 0, 0, "Photon burns")
|
||||
H.apply_damage(flash_strength * H.species.flash_burn/5, BURN, BP_HEAD, 0, 0)
|
||||
|
||||
else
|
||||
flashfail = 1
|
||||
|
||||
@@ -483,8 +483,8 @@
|
||||
|
||||
//IF the crystal somehow ends up in a tummy and digesting with a bound mob who doesn't want to be eaten, let's move them to the ground
|
||||
/obj/item/capture_crystal/digest_act(var/atom/movable/item_storage = null)
|
||||
if(bound_mob) //CHOMPEdit
|
||||
if(bound_mob in contents && !bound_mob.devourable)
|
||||
if(bound_mob) // CHOMPEdit
|
||||
if((bound_mob in contents) && !bound_mob.devourable)
|
||||
bound_mob.forceMove(src.drop_location())
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -89,11 +89,11 @@
|
||||
|
||||
if(user.gloves && !protected_hands)
|
||||
to_chat(user, span_warning("\The [src] partially cuts into your hand through your gloves as you hit \the [target]!"))
|
||||
user.apply_damage(light_glove_d + will_break ? break_damage : 0, BRUTE, active_hand, 0, 0, src, src.sharp, src.edge) // Ternary to include break damage
|
||||
user.apply_damage(light_glove_d + will_break ? break_damage : 0, BRUTE, active_hand, 0, 0, src.sharp, src.edge, src) // Ternary to include break damage
|
||||
|
||||
else if(!user.gloves)
|
||||
to_chat(user, span_warning("\The [src] cuts into your hand as you hit \the [target]!"))
|
||||
user.apply_damage(no_glove_d + will_break ? break_damage : 0, BRUTE, active_hand, 0, 0, src, src.sharp, src.edge)
|
||||
user.apply_damage(no_glove_d + will_break ? break_damage : 0, BRUTE, active_hand, 0, 0, src.sharp, src.edge, src)
|
||||
|
||||
if(will_break && src.loc == user) // If it's not in our hand anymore
|
||||
user.visible_message(span_danger("[user] hit \the [target] with \the [src], shattering it!"), span_warning("You shatter \the [src] in your hand!"))
|
||||
|
||||
@@ -352,7 +352,7 @@
|
||||
|
||||
L.add_modifier(/datum/modifier/entangled, 3 SECONDS)
|
||||
|
||||
if(!L.apply_damage(force * (issilicon(L) ? 0.25 : 1), BRUTE, target_zone, blocked, soaked, src, sharp, edge))
|
||||
if(!L.apply_damage(force * (issilicon(L) ? 0.25 : 1), BRUTE, target_zone, blocked, soaked, sharp, edge, src))
|
||||
return
|
||||
|
||||
playsound(src, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds
|
||||
|
||||
@@ -70,7 +70,6 @@ var/global/list/micro_tunnels = list()
|
||||
for(var/datum/planet/P in SSplanets.planets)
|
||||
if(myturf.z in P.expected_z_levels)
|
||||
planet = P
|
||||
else
|
||||
for(var/obj/structure/micro_tunnel/t in micro_tunnels)
|
||||
if(t == src)
|
||||
continue
|
||||
@@ -85,7 +84,6 @@ var/global/list/micro_tunnels = list()
|
||||
if(targetturf.z in planet.expected_z_levels)
|
||||
destinations |= t
|
||||
continue
|
||||
else
|
||||
var/above = GetAbove(myturf)
|
||||
if(above && t.z == z + 1)
|
||||
destinations |= t
|
||||
|
||||
@@ -181,7 +181,7 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
|
||||
|
||||
|
||||
/obj/structure/mob_spawner/scanner/proc/CheckProximity(atom/movable/AM,turf/new_loc)
|
||||
if(AM in mobs_in_range && (!AM || get_dist(src,new_loc) > range))
|
||||
if((AM in mobs_in_range) && (!AM || get_dist(src,new_loc) > range))
|
||||
mobs_in_range -= AM
|
||||
|
||||
//CHOMPEdit End
|
||||
|
||||
@@ -152,7 +152,6 @@
|
||||
if (prob(50))
|
||||
qdel(src)
|
||||
return
|
||||
else
|
||||
return
|
||||
|
||||
/obj/structure/closet/crate/secure
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
comp.paused = FALSE
|
||||
identifier = length(comp.identifier) > 0 ? comp.identifier : initial(identifier)
|
||||
material = length(comp.material) > 0 ? comp.material : initial(material)
|
||||
tint = length(comp.tint) > 0 ? comp.tint : initial(tint)
|
||||
tint = length(comp.tint) > 0 ? comp.tint : initial(comp.tint)
|
||||
adjective = length(comp.adjective) > 0 ? comp.adjective : initial(adjective)
|
||||
if (copytext_char(adjective, -1) != "s")
|
||||
adjective += "s"
|
||||
|
||||
@@ -321,7 +321,6 @@
|
||||
if (prob(5))
|
||||
dismantle()
|
||||
return
|
||||
else
|
||||
return
|
||||
|
||||
/obj/structure/girder/cult
|
||||
|
||||
@@ -50,7 +50,6 @@
|
||||
return
|
||||
if(3.0)
|
||||
return
|
||||
else
|
||||
return
|
||||
|
||||
/obj/structure/lattice/attackby(obj/item/C as obj, mob/user as mob)
|
||||
|
||||
@@ -275,7 +275,7 @@
|
||||
to_chat(user, span_warning("There is no tank in \the [src]."))
|
||||
return
|
||||
if(is_loosen)
|
||||
to_chat(user, span_warning("Tighten \the nut with a wrench first."))
|
||||
to_chat(user, span_warning("Tighten the nut with a wrench first."))
|
||||
return
|
||||
if(!Adjacent(target))
|
||||
return
|
||||
|
||||
@@ -277,7 +277,6 @@
|
||||
if(3.0)
|
||||
qdel(src)
|
||||
return
|
||||
else
|
||||
return
|
||||
|
||||
// Duplicated from structures.dm, but its a bit different.
|
||||
|
||||
@@ -1855,7 +1855,7 @@
|
||||
desc = "The red flag of the Five Arrows."
|
||||
description_fluff = "The Five Arrows is an independent government entity that seceded from the Solar Confederate Government in 2570, in response to perceived \
|
||||
failures in aiding the Sagittarius Heights during the Skathari Incursion. The success of the government in achieving effective local defense and prosperity has \
|
||||
since attracted the membership of Kauq'xum, a remote Skrellian colony. \The Five Arrows formed the model for SolGov's own semi-autonomous \"Regional Blocs\"."
|
||||
since attracted the membership of Kauq'xum, a remote Skrellian colony. The Five Arrows formed the model for SolGov's own semi-autonomous \"Regional Blocs\"."
|
||||
icon_state = "fivearrows"
|
||||
flagtype = /obj/item/flag/fivearrows
|
||||
|
||||
@@ -1870,7 +1870,7 @@
|
||||
desc = "The red flag of the Five Arrows."
|
||||
description_fluff = "The Five Arrows is an independent government entity that seceded from the Solar Confederate Government in 2570, in response to perceived \
|
||||
failures in aiding the Sagittarius Heights during the Skathari Incursion. The success of the government in achieving effective local defense and prosperity has \
|
||||
since attracted the membership of Kauq'xum, a remote Skrellian colony. \The Five Arrows formed the model for SolGov's own semi-autonomous \"Regional Blocs\"."
|
||||
since attracted the membership of Kauq'xum, a remote Skrellian colony. The Five Arrows formed the model for SolGov's own semi-autonomous \"Regional Blocs\"."
|
||||
flag_path = "fivearrows"
|
||||
|
||||
/obj/item/flag/fivearrows/l
|
||||
|
||||
@@ -581,7 +581,6 @@
|
||||
return 6
|
||||
if("SOUTHWEST", "SW")
|
||||
return 10
|
||||
else
|
||||
return 0
|
||||
|
||||
|
||||
@@ -606,5 +605,4 @@
|
||||
return "NW"
|
||||
if(10)
|
||||
return "SW"
|
||||
else
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user