cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 14:47:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes oil streaking (#12980)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-08-22 12:47:30 -04:00
committed by GitHub
co-authored by Cameron Lennox
parent 797bc17c06
commit d73c45278b
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living_defense.dm
+1 -1
View File
@@ -225,7 +225,7 @@
standard_weapon_hit_effects(I, user, effective_force, blocked, hit_zone)
if(I.damtype == BRUTE && prob(33)) // Added blood for whacking non-humans too
if(I.force >= 5 && I.damtype == BRUTE && prob(33)) // Added blood for whacking non-humans too
var/turf/simulated/location = get_turf(src)
if(istype(location)) location.add_blood_floor(src)
code/modules/mob/living/silicon/robot/robot.dm
+6 -9
View File
@@ -612,9 +612,6 @@
return 2
/mob/living/silicon/robot/attackby(obj/item/W, mob/user)
if (istype(W, /obj/item/handcuffs)) // fuck i don't even know why isrobot() in handcuff code isn't working so this will have to do
return
if(opened) // Are they trying to insert something?
for(var/V in components)
var/datum/robot_component/C = components[V]
@@ -821,21 +818,21 @@
else
to_chat(user, span_filter_notice("[span_red("Access denied.")]"))
else if(istype(W, /obj/item/borg/upgrade/))
var/obj/item/borg/upgrade/U = W
else if(istype(W, /obj/item/borg/upgrade))
var/obj/item/borg/upgrade/upgrade = W
if(!opened)
to_chat(user, span_filter_notice("You must access the borgs internals!"))
else if(!module && U.require_module)
else if(!module && upgrade.require_module)
to_chat(user, span_filter_notice("The borg must choose a module before it can be upgraded!"))
else if(user == src && istype(W,/obj/item/borg/upgrade/utility/reset))
to_chat(user, span_warning("You are restricted from reseting your own module."))
else if(U.locked)
else if(upgrade.locked)
to_chat(user, span_filter_notice("The upgrade is locked and cannot be used yet!"))
else
if(U.action(user, src))
if(upgrade.action(user, src))
to_chat(user, span_filter_notice("You apply the upgrade to [src]!"))
user.drop_item()
U.loc = src
upgrade.forceMove(src)
hud_used.update_robot_modules_display()
else
to_chat(user, span_filter_notice("Upgrade error!"))