cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 13:38:41 +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 14:18:21 +00:00
committed by GitHub
co-authored by LemonInTheDark Gandalf2k15
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/paperwork/carbonpaper.dm
+1 -1
View File
@@ -37,7 +37,7 @@
else
to_chat(user, "<span class='notice'>There are no more carbon copies attached to this paper!</span>")
/obj/item/paper/carbon/attack_hand(mob/living/user)
/obj/item/paper/carbon/attack_hand(mob/living/user, list/modifiers)
if(loc == user && user.is_holding(src))
removecopy(user)
return
code/modules/paperwork/filingcabinet.dm
+2 -2
View File
@@ -139,7 +139,7 @@
virgin = FALSE //tabbing here is correct- it's possible for people to try and use it
//before the records have been generated, so we do this inside the loop.
/obj/structure/filingcabinet/security/attack_hand()
/obj/structure/filingcabinet/security/attack_hand(mob/user, list/modifiers)
populate()
return ..()
@@ -174,7 +174,7 @@
//before the records have been generated, so we do this inside the loop.
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/structure/filingcabinet/medical/attack_hand()
/obj/structure/filingcabinet/medical/attack_hand(mob/user, list/modifiers)
populate()
return ..()
code/modules/paperwork/paper_cutter.dm
+1 -1
View File
@@ -67,7 +67,7 @@
return
..()
/obj/item/papercutter/attack_hand(mob/user)
/obj/item/papercutter/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return
code/modules/paperwork/paperbin.dm
+4 -4
View File
@@ -55,11 +55,11 @@
add_fingerprint(M)
/obj/item/paper_bin/attack_paw(mob/user)
return attack_hand(user)
/obj/item/paper_bin/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/paper_bin/attack_hand(mob/user)
/obj/item/paper_bin/attack_hand(mob/user, list/modifiers)
if(isliving(user))
var/mob/living/L = user
if(!(L.mobility_flags & MOBILITY_PICKUP))
@@ -148,7 +148,7 @@
papertype = /obj/item/paper/natural
resistance_flags = FLAMMABLE
/obj/item/paper_bin/bundlenatural/attack_hand(mob/user)
/obj/item/paper_bin/bundlenatural/attack_hand(mob/user, list/modifiers)
..()
if(total_paper < 1)
qdel(src)
code/modules/paperwork/stamps.dm
+2 -2
View File
@@ -87,5 +87,5 @@
icon_state = "stamp-syndicate"
dye_color = DYE_SYNDICATE
/obj/item/stamp/attack_paw(mob/user)
return attack_hand(user)
/obj/item/stamp/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
code/modules/paperwork/ticketmachine.dm
+2 -2
View File
@@ -160,7 +160,7 @@
/obj/machinery/ticket_machine/proc/reset_cooldown()
ready = TRUE
/obj/machinery/ticket_machine/attack_hand(mob/living/carbon/user)
/obj/machinery/ticket_machine/attack_hand(mob/living/carbon/user, list/modifiers)
. = ..()
if(!ready)
to_chat(user,"<span class='warning'>You press the button, but nothing happens...</span>")
@@ -208,7 +208,7 @@
var/obj/machinery/ticket_machine/source
var/ticket_number
/obj/item/ticket_machine_ticket/attack_hand(mob/user)
/obj/item/ticket_machine_ticket/attack_hand(mob/user, list/modifiers)
. = ..()
maptext = saved_maptext //For some reason, storage code removes all maptext off objs, this stops its number from being wiped off when taken out of storage.