cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 03:55:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Converts many proc overrides to properly use list/modifiers, lots of other smaller things (#3433)

Browse Source 
* Converts many proc overrides to properly use list/modifiers, lots of other smaller things

* Update human_defense.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-02-17 15:18:21 +01:00
committed by GitHub
parent 6f01502b33
commit 43febe3145
254 changed files with 837 additions and 837 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/abandoned_crates.dm
+1 -1
View File
@@ -26,7 +26,7 @@
digits -= dig //there are never matching digits in the answer
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/structure/closet/crate/secure/loot/attack_hand(mob/user)
/obj/structure/closet/crate/secure/loot/attack_hand(mob/user, list/modifiers)
if(locked)
to_chat(user, "<span class='notice'>The crate is locked with a Deca-code lock.</span>")
var/input = input(usr, "Enter [codelen] digits. All digits must be unique.", "Deca-Code Lock", "") as text|null
code/modules/mining/aux_base.dm
+1 -1
View File
@@ -323,7 +323,7 @@
var/anti_spam_cd = 0 //The linking process might be a bit intensive, so this here to prevent over use.
var/console_range = 15 //Wifi range of the beacon to find the aux base console
/obj/structure/mining_shuttle_beacon/attack_hand(mob/user)
/obj/structure/mining_shuttle_beacon/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
code/modules/mining/equipment/marker_beacons.dm
+1 -1
View File
@@ -106,7 +106,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sortList(list(
icon_state = "[icon_prefix][lowertext(picked_color)]-on"
set_light(light_range, light_power, GLOB.marker_beacon_colors[picked_color])
/obj/structure/marker_beacon/attack_hand(mob/living/user)
/obj/structure/marker_beacon/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
code/modules/mining/equipment/survival_pod.dm
+1 -1
View File
@@ -175,7 +175,7 @@
qdel(src)
return TRUE
/obj/item/gps/computer/attack_hand(mob/user)
/obj/item/gps/computer/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
code/modules/mining/laborcamp/laborstacker.dm
+1 -1
View File
@@ -149,7 +149,7 @@ GLOBAL_LIST(labor_sheet_values)
icon_state = "console"
density = FALSE
/obj/machinery/mineral/labor_points_checker/attack_hand(mob/user)
/obj/machinery/mineral/labor_points_checker/attack_hand(mob/user, list/modifiers)
. = ..()
if(. || user.is_blind())
return
code/modules/mining/lavaland/ash_flora.dm
+1 -1
View File
@@ -66,7 +66,7 @@
else
return ..()
/obj/structure/flora/ash/attack_hand(mob/user)
/obj/structure/flora/ash/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
code/modules/mining/lavaland/ruins/gym.dm
+2 -2
View File
@@ -8,7 +8,7 @@
var/list/hit_sounds = list('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg',\
'sound/weapons/punch1.ogg', 'sound/weapons/punch2.ogg', 'sound/weapons/punch3.ogg', 'sound/weapons/punch4.ogg')
/obj/structure/punching_bag/attack_hand(mob/user as mob)
/obj/structure/punching_bag/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
@@ -29,7 +29,7 @@
/obj/structure/weightmachine/proc/AnimateMachine(mob/living/user)
return
/obj/structure/weightmachine/attack_hand(mob/living/user)
/obj/structure/weightmachine/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
code/modules/mining/mine_items.dm
+1 -1
View File
@@ -78,7 +78,7 @@
var/static/list/dumb_rev_heads = list()
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/machinery/computer/shuttle/mining/attack_hand(mob/user)
/obj/machinery/computer/shuttle/mining/attack_hand(mob/user, list/modifiers)
if(is_station_level(user.z) && user.mind && is_head_revolutionary(user) && !(user.mind in dumb_rev_heads))
to_chat(user, "<span class='warning'>You get a feeling that leaving the station might be a REALLY dumb idea...</span>")
dumb_rev_heads += user.mind
code/modules/mining/minebot.dm
+4 -4
View File
@@ -122,17 +122,17 @@
deathmessage = "blows apart!"
..()
/mob/living/simple_animal/hostile/mining_drone/attack_hand(mob/living/carbon/human/M)
/mob/living/simple_animal/hostile/mining_drone/attack_hand(mob/living/carbon/human/user, list/modifiers)
. = ..()
if(.)
return
if(!M.combat_mode)
if(!user.combat_mode)
toggle_mode()
switch(mode)
if(MINEDRONE_COLLECT)
to_chat(M, "<span class='info'>[src] has been set to search and store loose ore.</span>")
to_chat(user, "<span class='info'>[src] has been set to search and store loose ore.</span>")
if(MINEDRONE_ATTACK)
to_chat(M, "<span class='info'>[src] has been set to attack hostile wildlife.</span>")
to_chat(user, "<span class='info'>[src] has been set to attack hostile wildlife.</span>")
return
/mob/living/simple_animal/hostile/mining_drone/CanAllowThrough(atom/movable/O)
code/modules/mining/satchel_ore_boxdm.dm
+1 -1
View File
@@ -35,7 +35,7 @@
ui_interact(user)
. = ..()
/obj/structure/ore_box/attack_hand(mob/user)
/obj/structure/ore_box/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return