cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +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/holodeck/items.dm
+8 -8
View File
@@ -40,14 +40,14 @@
return ..()
return 0
/obj/item/holo/esword/attack(target as mob, mob/user as mob)
/obj/item/holo/esword/attack(target, mob/user)
..()
/obj/item/holo/esword/Initialize()
. = ..()
saber_color = pick("red","blue","green","purple")
/obj/item/holo/esword/attack_self(mob/living/user as mob)
/obj/item/holo/esword/attack_self(mob/living/user)
active = !active
if (active)
force = 30
@@ -103,12 +103,12 @@
anchored = TRUE
density = TRUE
/obj/structure/holohoop/attackby(obj/item/W as obj, mob/user as mob, params)
/obj/structure/holohoop/attackby(obj/item/W, mob/user, params)
if(get_dist(src,user)<2)
if(user.transferItemToLoc(W, drop_location()))
visible_message("<span class='warning'>[user] dunks [W] into \the [src]!</span>")
/obj/structure/holohoop/attack_hand(mob/living/user)
/obj/structure/holohoop/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
@@ -156,18 +156,18 @@
active_power_usage = 6
power_channel = AREA_USAGE_ENVIRON
/obj/machinery/readybutton/attack_ai(mob/user as mob)
/obj/machinery/readybutton/attack_ai(mob/user)
to_chat(user, "<span class='warning'>The station AI is not to interact with these devices!</span>")
return
/obj/machinery/readybutton/attack_paw(mob/user as mob)
/obj/machinery/readybutton/attack_paw(mob/user, list/modifiers)
to_chat(user, "<span class='warning'>You are too primitive to use this device!</span>")
return
/obj/machinery/readybutton/attackby(obj/item/W as obj, mob/user as mob, params)
/obj/machinery/readybutton/attackby(obj/item/W, mob/user, params)
to_chat(user, "<span class='warning'>The device is a solid button, there's nothing you can do with it!</span>")
/obj/machinery/readybutton/attack_hand(mob/user as mob)
/obj/machinery/readybutton/attack_hand(mob/user, list/modifiers)
. = ..()
if(.)
return