cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 20:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Catches the rest, unfortunately including some comments. Oh well!

Browse Source
This commit is contained in:
MarinaGryphon
2021-07-16 15:58:57 -05:00
parent a843667af3
commit f5db6b47e8
21 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__defines/ZAS.dm
+1 -1
View File
@@ -9,5 +9,5 @@
// More complicated, conditional airflow should override CanZASPass().
#define ATMOS_PASS_YES 1 // Always blocks air and zones.
#define ATMOS_PASS_NO 2 // Never blocks air or zones.
#define ATMOS_PASS_DENSITY 3 // Blocks air and zones if density = 1, allows both if density = 0
#define ATMOS_PASS_DENSITY 3 // Blocks air and zones if density = TRUE, allows both if density = FALSE
#define ATMOS_PASS_PROC 4 // Call CanZASPass() using c_airblock
code/_helpers/unsorted.dm
+1 -1
View File
@@ -65,7 +65,7 @@
.+=360
//Returns location. Returns null if no location was found.
/proc/get_teleport_loc(turf/location,mob/target,distance = 1, density = 0, errorx = 0, errory = 0, eoffsetx = 0, eoffsety = 0)
/proc/get_teleport_loc(turf/location,mob/target,distance = 1, density = FALSE, errorx = 0, errory = 0, eoffsetx = 0, eoffsety = 0)
/*
Location where the teleport begins, target that will teleport, distance to go, density checking 0/1(yes/no).
Random error in tile placement x, error in tile placement y, and block offset.
code/datums/supplypacks/hydroponics.dm
+1 -1
View File
@@ -153,6 +153,6 @@
cost = 50
containertype = /obj/structure/closet/crate/aether
containername = "Hydroponics tray crate"
contains = list(/obj/machinery/portable_atmospherics/hydroponics{anchored = 0} = 3)
contains = list(/obj/machinery/portable_atmospherics/hydroponics{anchored = FALSE} = 3)
access = access_hydroponics
code/datums/supplypacks/supply.dm
+1 -1
View File
@@ -77,7 +77,7 @@
/obj/item/weapon/folder/yellow,
/obj/item/weapon/hand_labeler,
/obj/item/weapon/tape_roll,
/obj/structure/filingcabinet/chestdrawer{anchored = 0},
/obj/structure/filingcabinet/chestdrawer{anchored = FALSE},
/obj/item/weapon/paper_bin
)
name = "Office supplies"
code/game/gamemodes/cult/cult_items.dm
+1 -1
View File
@@ -26,7 +26,7 @@
var/obj/item/organ/external/affecting = H.get_organ(zone)
to_chat(user, "<span class='danger'>An inexplicable force rips through your [affecting.name], tearing the sword from your grasp!</span>")
//random amount of damage between half of the blade's force and the full force of the blade.
user.apply_damage(rand(force/2, force), BRUTE, zone, 0, sharp=1, edge=1)
user.apply_damage(rand(force/2, force), BRUTE, zone, 0, sharp = TRUE, edge = TRUE)
user.Weaken(5)
else if(!istype(user, /mob/living/simple_mob/construct))
to_chat(user, "<span class='danger'>An inexplicable force rips through you, tearing the sword from your grasp!</span>")
code/game/machinery/doors/door.dm
+1 -1
View File
@@ -157,7 +157,7 @@
/obj/machinery/door/CanZASPass(turf/T, is_zone)
if(is_zone)
return !block_air_zones // Block merging unless block_air_zones = 0
return !density // Block airflow unless density = 0
return !density // Block airflow unless density = FALSE
/obj/machinery/door/proc/bumpopen(mob/user as mob)
if(operating) return
code/game/machinery/telecomms/presets.dm
+1 -1
View File
@@ -28,7 +28,7 @@
id = "CentCom Relay"
hide = 1
toggled = 1
//anchored = 1
//anchored = TRUE
//use_power = 0
//idle_power_usage = 0
produces_heat = 0
code/game/objects/stumble_into_vr.dm
+1 -1
View File
@@ -41,7 +41,7 @@
/obj/structure/kitchenspike/stumble_into(mob/living/M)
playsound(src, "sound/weapons/pierce.ogg", 25, 1, -1)
visible_message("<span class='warning'>[M] [pick("ran", "slammed")] into the spikes on \the [src]!</span>")
M.apply_damage(15, BRUTE, sharp=1)
M.apply_damage(15, BRUTE, sharp = TRUE)
M.Weaken(5)
M.stop_flying()
code/modules/hydroponics/seed.dm
+2 -2
View File
@@ -140,7 +140,7 @@
if(affecting)
to_chat(target, "<span class='danger'>\The [fruit]'s thorns pierce your [affecting.name] greedily!</span>")
target.apply_damage(damage, BRUTE, target_limb, blocked, soaked, "Thorns", sharp=1, edge=has_edge)
target.apply_damage(damage, BRUTE, target_limb, blocked, soaked, "Thorns", sharp = TRUE, edge=has_edge)
else
to_chat(target, "<span class='danger'>\The [fruit]'s thorns pierce your flesh greedily!</span>")
target.adjustBruteLoss(damage)
@@ -149,7 +149,7 @@
has_edge = prob(get_trait(TRAIT_POTENCY)/5)
if(affecting)
to_chat(target, "<span class='danger'>\The [fruit]'s thorns dig deeply into your [affecting.name]!</span>")
target.apply_damage(damage, BRUTE, target_limb, blocked, "Thorns", sharp=1, edge=has_edge)
target.apply_damage(damage, BRUTE, target_limb, blocked, "Thorns", sharp = TRUE, edge=has_edge)
else
to_chat(target, "<span class='danger'>\The [fruit]'s thorns dig deeply into your flesh!</span>")
target.adjustBruteLoss(damage)
code/modules/mob/living/carbon/human/human_damage.dm
+3 -3
View File
@@ -358,7 +358,7 @@ In most cases it makes more sense to use apply_damage() instead! And make sure t
//Damages ONE external organ, organ gets randomly selected from damagable ones.
//It automatically updates damage overlays if necesary
//It automatically updates health status
/mob/living/carbon/human/take_organ_damage(var/brute, var/burn, var/sharp = 0, var/edge = 0)
/mob/living/carbon/human/take_organ_damage(var/brute, var/burn, var/sharp = FALSE, var/edge = FALSE)
var/list/obj/item/organ/external/parts = get_damageable_organs()
if(!parts.len) return
var/obj/item/organ/external/picked = pick(parts)
@@ -391,7 +391,7 @@ In most cases it makes more sense to use apply_damage() instead! And make sure t
if(update) UpdateDamageIcon()
// damage MANY external organs, in random order
/mob/living/carbon/human/take_overall_damage(var/brute, var/burn, var/sharp = 0, var/edge = 0, var/used_weapon = null)
/mob/living/carbon/human/take_overall_damage(var/brute, var/burn, var/sharp = FALSE, var/edge = FALSE, var/used_weapon = null)
if(status_flags & GODMODE) return //godmode
var/list/obj/item/organ/external/parts = get_damageable_organs()
var/update = 0
@@ -448,7 +448,7 @@ This function restores all organs.
return organs_by_name[zone]
*/
/mob/living/carbon/human/apply_damage(var/damage = 0, var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/soaked = 0, var/sharp = 0, var/edge = 0, var/obj/used_weapon = null)
/mob/living/carbon/human/apply_damage(var/damage = 0, var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/soaked = 0, var/sharp = FALSE, var/edge = FALSE, var/obj/used_weapon = null)
if(Debug2)
to_world_log("## DEBUG: human/apply_damage() was called on [src], with [damage] damage, an armor value of [blocked], and a soak value of [soaked].")
code/modules/mob/living/damage_procs.dm
+1 -1
View File
@@ -8,7 +8,7 @@
Returns
standard 0 if fail
*/
/mob/living/proc/apply_damage(var/damage = 0,var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/soaked = 0, var/used_weapon = null, var/sharp = 0, var/edge = 0, var/obj/used_weapon = null)
/mob/living/proc/apply_damage(var/damage = 0,var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/soaked = 0, var/used_weapon = null, var/sharp = FALSE, var/edge = FALSE, var/obj/used_weapon = null)
if(Debug2)
to_world_log("## DEBUG: apply_damage() was called on [src], with [damage] damage, and an armor value of [blocked].")
if(!damage || (blocked >= 100))
code/modules/mob/living/silicon/robot/drone/drone_damage.dm
+2 -2
View File
@@ -1,5 +1,5 @@
//Redefining some robot procs, since drones can't be repaired and really shouldn't take component damage.
/mob/living/silicon/robot/drone/take_overall_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/used_weapon = null)
/mob/living/silicon/robot/drone/take_overall_damage(var/brute = 0, var/burn = 0, var/sharp = FALSE, var/used_weapon = null)
bruteloss += brute
fireloss += burn
@@ -11,7 +11,7 @@
if(bruteloss<0) bruteloss = 0
if(fireloss<0) fireloss = 0
/mob/living/silicon/robot/drone/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/emp = 0)
/mob/living/silicon/robot/drone/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = FALSE, var/emp = 0)
take_overall_damage(brute,burn)
/mob/living/silicon/robot/drone/heal_organ_damage(var/brute, var/burn)
code/modules/mob/living/silicon/robot/robot_damage.dm
+2 -2
View File
@@ -62,7 +62,7 @@
var/datum/robot_component/picked = pick(parts)
picked.heal_damage(brute,burn)
/mob/living/silicon/robot/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/edge = 0, var/emp = 0)
/mob/living/silicon/robot/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = FALSE, var/edge = FALSE, var/emp = 0)
var/list/components = get_damageable_components()
if(!components.len)
return
@@ -110,7 +110,7 @@
parts -= picked
/mob/living/silicon/robot/take_overall_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/used_weapon = null)
/mob/living/silicon/robot/take_overall_damage(var/brute = 0, var/burn = 0, var/sharp = FALSE, var/used_weapon = null)
if(status_flags & GODMODE) return //godmode
var/list/datum/robot_component/parts = get_damageable_components()
code/modules/multiz/movement.dm
+2 -2
View File
@@ -327,7 +327,7 @@
// Things that prevent objects standing on them from falling into turf below
/obj/structure/catwalk/CanFallThru(atom/movable/mover as mob|obj, turf/target as turf)
if((target.z < z) && !hatch_open)
return FALSE // TODO - Technically should be density = 1 and flags |= ON_BORDER
return FALSE // TODO - Technically should be density = TRUE and flags |= ON_BORDER
if(!isturf(mover.loc))
return FALSE // Only let loose floor items fall. No more snatching things off people's hands.
else
@@ -345,7 +345,7 @@
if(!isturf(mover.loc))
return FALSE // Only let loose floor items fall. No more snatching things off people's hands.
else
return FALSE // TODO - Technically should be density = 1 and flags |= ON_BORDER
return FALSE // TODO - Technically should be density = TRUE and flags |= ON_BORDER
// So you'll slam when falling onto a grille
/obj/structure/lattice/CheckFall(var/atom/movable/falling_atom)
code/modules/projectiles/gun.dm
+1 -1
View File
@@ -709,7 +709,7 @@
in_chamber.on_hit(M)
if(in_chamber.damage_type != HALLOSS && !in_chamber.nodamage)
log_and_message_admins("[key_name(user)] commited suicide using \a [src]")
user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, "head", used_weapon = "Point blank shot in the mouth with \a [in_chamber]", sharp=1)
user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, "head", used_weapon = "Point blank shot in the mouth with \a [in_chamber]", sharp = TRUE)
user.death()
else if(in_chamber.damage_type == HALLOSS)
to_chat(user, "<span class = 'notice'>Ow...</span>")
code/modules/projectiles/guns/launcher/bows.dm
+4 -4
View File
@@ -6,8 +6,8 @@
item_state = "bolt"
throwforce = 8
w_class = ITEMSIZE_NORMAL
sharp = 1
edge = 0
sharp = TRUE
edge = FALSE
/obj/item/weapon/arrow/energy
name = "hardlight arrow"
@@ -17,8 +17,8 @@
item_state = "bolt"
throwforce = 10
w_class = ITEMSIZE_NORMAL
sharp = 0
edge = 1
sharp = FALSE
edge = TRUE
/obj/item/weapon/arrow/energy/throw_impact(atom/hit_atom)
. = ..()
code/modules/reagents/machinery/dispenser/supply.dm
+3 -3
View File
@@ -1,7 +1,7 @@
/datum/supply_pack/chemistry_dispenser
name = "Reagent dispenser"
contains = list(
/obj/machinery/chemical_dispenser{anchored = 0}
/obj/machinery/chemical_dispenser{anchored = FALSE}
)
cost = 25
containertype = /obj/structure/largecrate
@@ -11,7 +11,7 @@
/datum/supply_pack/beer_dispenser
name = "Booze dispenser"
contains = list(
/obj/machinery/chemical_dispenser/bar_alc{anchored = 0}
/obj/machinery/chemical_dispenser/bar_alc{anchored = FALSE}
)
cost = 25
containertype = /obj/structure/largecrate
@@ -21,7 +21,7 @@
/datum/supply_pack/soda_dispenser
name = "Soda dispenser"
contains = list(
/obj/machinery/chemical_dispenser/bar_soft{anchored = 0}
/obj/machinery/chemical_dispenser/bar_soft{anchored = FALSE}
)
cost = 25
containertype = /obj/structure/largecrate
code/modules/surgery/face.dm
+1 -1
View File
@@ -116,7 +116,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("<span class='danger'>[user]'s hand slips, tearing skin on [target]'s face with \the [tool]!</span>", \
"<span class='danger'>Your hand slips, tearing skin on [target]'s face with \the [tool]!</span>")
target.apply_damage(10, BRUTE, affected, sharp=1, sharp=1)
target.apply_damage(10, BRUTE, affected, sharp = TRUE, sharp = TRUE)
///////////////////////////////////////////////////////////////
// Face Cauterizing Surgery
code/modules/surgery/generic.dm
+1 -1
View File
@@ -257,7 +257,7 @@
msg = "<span class='danger'>[user]'s hand slips, damaging several organs in [target]'s lower abdomen with \the [tool]!</span>"
self_msg = "<span class='danger'>Your hand slips, damaging several organs in [target]'s lower abdomen with \the [tool]!</span>"
user.visible_message(msg, self_msg)
target.apply_damage(12, BRUTE, affected, sharp=1)
target.apply_damage(12, BRUTE, affected, sharp = TRUE)
///////////////////////////////////////////////////////////////
// Cauterize Surgery
code/modules/surgery/limb_reattach.dm
+3 -3
View File
@@ -74,7 +74,7 @@
var/obj/item/organ/external/E = tool
user.visible_message("<span class='warning'> [user]'s hand slips, damaging [target]'s [E.amputation_point]!</span>", \
"<span class='warning'> Your hand slips, damaging [target]'s [E.amputation_point]!</span>")
target.apply_damage(10, BRUTE, null, sharp=1)
target.apply_damage(10, BRUTE, null, sharp = TRUE)
///////////////////////////////////////////////////////////////
// Limb Connection Surgery
@@ -113,7 +113,7 @@
var/obj/item/organ/external/E = tool
user.visible_message("<span class='warning'> [user]'s hand slips, damaging [target]'s [E.amputation_point]!</span>", \
"<span class='warning'> Your hand slips, damaging [target]'s [E.amputation_point]!</span>")
target.apply_damage(10, BRUTE, null, sharp=1)
target.apply_damage(10, BRUTE, null, sharp = TRUE)
///////////////////////////////////////////////////////////////
// Robolimb Attachment Surgery
@@ -164,4 +164,4 @@
/datum/surgery_step/limb/mechanize/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
user.visible_message("<span class='warning'> [user]'s hand slips, damaging [target]'s flesh!</span>", \
"<span class='warning'> Your hand slips, damaging [target]'s flesh!</span>")
target.apply_damage(10, BRUTE, null, sharp=1)
target.apply_damage(10, BRUTE, null, sharp = TRUE)
code/modules/vore/smoleworld/smoleworld_vr.dm
+1 -1
View File
@@ -357,7 +357,7 @@
// desc = "Lets burn rubber!"
// icon = 'icons/vore/smoleworld_vr.dmi'
// icon_state = "smolecarA"
// anchored = 0
// anchored = FALSE
// buckle_movable = 1
// var/carry_type = /obj/item/smolecar
//