cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

either destroys the entire game, or increases performance... maybe both (#16178)

Browse Source
This commit is contained in:
ChesterTheCheesy
2022-10-29 16:02:44 +02:00
committed by GitHub
parent 1104e8e4be
commit 4aa6c0b45d
187 changed files with 1412 additions and 1410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/projectiles/guns/ballistic/laser_gatling.dm
View File

@@ -76,8 +76,8 @@
if(!M.incapacitated())
if(istype(over_object, /obj/screen/inventory/hand))
var/obj/screen/inventory/hand/H = over_object
if(istype(over_object, /atom/movable/screen/inventory/hand))
var/atom/movable/screen/inventory/hand/H = over_object
M.putItemFromInventoryInHandIfPossible(src, H.held_index)

4
code/modules/projectiles/guns/ballistic/minigun.dm
View File

@@ -76,8 +76,8 @@
if(!M.incapacitated())
if(istype(over_object, /obj/screen/inventory/hand))
var/obj/screen/inventory/hand/H = over_object
if(istype(over_object, /atom/movable/screen/inventory/hand))
var/atom/movable/screen/inventory/hand/H = over_object
M.putItemFromInventoryInHandIfPossible(src, H.held_index)

4
code/modules/projectiles/guns/misc/beam_rifle.dm
View File

@@ -287,7 +287,7 @@
/obj/item/gun/energy/beam_rifle/onMouseDown(object, location, params, mob/mob)
if(istype(mob))
set_user(mob)
if(istype(object, /obj/screen) && !istype(object, /obj/screen/click_catcher))
if(istype(object, /atom/movable/screen) && !istype(object, /atom/movable/screen/click_catcher))
return
if((object in mob.contents) || (object == mob))
return
@@ -295,7 +295,7 @@
return ..()
/obj/item/gun/energy/beam_rifle/onMouseUp(object, location, params, mob/M)
if(istype(object, /obj/screen) && !istype(object, /obj/screen/click_catcher))
if(istype(object, /atom/movable/screen) && !istype(object, /atom/movable/screen/click_catcher))
return
process_aim()
if(aiming_time_left <= aiming_time_fire_threshold && check_user())

6
code/modules/projectiles/guns/misc/medbeam.dm
View File

@@ -189,7 +189,7 @@
if(ubercharge < 0)
ubercharge = 0
icon_state = "chronogun[round(ubercharge/10)]"
/// Sets last_holder for uber_act() to prevent exploits
@@ -212,11 +212,11 @@
uber_target = current_target
last_holder.status_flags |= GODMODE
last_holder.overlay_fullscreen("uber", /obj/screen/fullscreen/uber)
last_holder.overlay_fullscreen("uber", /atom/movable/screen/fullscreen/uber)
last_holder.add_atom_colour(list(-1,0,0,0, 0,-1,0,0, 0,0,-1,0, 0,0,0,1, 1,1,1,0), TEMPORARY_COLOUR_PRIORITY)
uber_target.status_flags |= GODMODE
uber_target.overlay_fullscreen("uber", /obj/screen/fullscreen/uber)
uber_target.overlay_fullscreen("uber", /atom/movable/screen/fullscreen/uber)
uber_target.add_atom_colour(list(-1,0,0,0, 0,-1,0,0, 0,0,-1,0, 0,0,0,1, 1,1,1,0), TEMPORARY_COLOUR_PRIORITY)
else /// this could remove an admin-given godmode but theres like 0.001% chance that will ever be an issue