shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch

Browse Source
This commit is contained in:
LetterN
2021-11-21 10:34:14 +08:00
parent fa6946fae4 f6ff310849
commit 8dcfea5817
213 changed files with 86534 additions and 1331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/apc_frame.dm
+1 -1
View File
@@ -95,7 +95,7 @@
/obj/item/wallframe/apc/try_build(turf/on_wall, user)
if(!..())
return
var/turf/T = get_turf(on_wall) //the user is not where it needs to be.
var/turf/T = get_turf(user)
var/area/A = get_area(T)
if(A.get_apc())
to_chat(user, "<span class='warning'>This area already has an APC!</span>")
code/game/objects/items/chrono_eraser.dm
+1 -1
View File
@@ -266,7 +266,7 @@
/obj/effect/chrono_field/singularity_pull()
return
/obj/effect/chrono_field/ex_act()
/obj/effect/chrono_field/ex_act(severity, target, origin)
return
/obj/effect/chrono_field/blob_act(obj/structure/blob/B)
code/game/objects/items/crayons.dm
+2
View File
@@ -763,6 +763,8 @@
if(isobj(target))
if(actually_paints)
if(istype(target, /obj/item/canvas)) //dont color our canvas neon green when im trying to paint please
return
var/list/hsl = rgb2hsl(hex2num(copytext(paint_color,2,4)),hex2num(copytext(paint_color,4,6)),hex2num(copytext(paint_color,6,8)))
var/static/whitelisted = typecacheof(list(/obj/structure/window,
/obj/effect/decal/cleanable/crayon,
code/game/objects/items/devices/chameleonproj.dm
+2 -2
View File
@@ -144,8 +144,8 @@
/obj/effect/dummy/chameleon/attack_alien()
master.disrupt()
/obj/effect/dummy/chameleon/ex_act(S, T)
contents_explosion(S, T)
/obj/effect/dummy/chameleon/ex_act(severity, target, origin)
contents_explosion(severity, target, origin)
master.disrupt()
/obj/effect/dummy/chameleon/bullet_act()
code/game/objects/items/devices/doorCharge.dm
+1 -1
View File
@@ -14,7 +14,7 @@
attack_verb = list("blown up", "exploded", "detonated")
custom_materials = list(/datum/material/iron=50, /datum/material/glass=30)
/obj/item/doorCharge/ex_act(severity, target)
/obj/item/doorCharge/ex_act(severity, target, origin)
switch(severity)
if(EXPLODE_DEVASTATE)
visible_message("<span class='warning'>[src] detonates!</span>")
code/game/objects/items/devices/portable_chem_mixer.dm
+1 -1
View File
@@ -27,7 +27,7 @@
QDEL_NULL(beaker)
return ..()
/obj/item/storage/portable_chem_mixer/ex_act(severity, target)
/obj/item/storage/portable_chem_mixer/ex_act(severity, target, origin)
if(severity < 3)
..()
code/game/objects/items/latexballoon.dm
+1 -1
View File
@@ -31,7 +31,7 @@
user.update_inv_hands()
loc.assume_air(air_contents)
/obj/item/latexballon/ex_act(severity, target)
/obj/item/latexballon/ex_act(severity, target, origin)
burst()
switch(severity)
if (1)
code/game/objects/items/melee/misc.dm
+1 -1
View File
@@ -557,7 +557,7 @@
..()
balanced = 0
/obj/item/melee/supermatter_sword/ex_act(severity, target)
/obj/item/melee/supermatter_sword/ex_act(severity, target, origin)
visible_message("<span class='danger'>The blast wave smacks into [src] and rapidly flashes to ash.</span>",\
"<span class='italics'>You hear a loud crack as you are washed with a wave of heat.</span>")
consume_everything()
code/game/objects/items/puzzle_pieces.dm
+1 -1
View File
@@ -54,7 +54,7 @@
/obj/machinery/door/keycard/emp_act(severity)
return
/obj/machinery/door/keycard/ex_act(severity, target)
/obj/machinery/door/keycard/ex_act(severity, target, origin)
return
/obj/machinery/door/keycard/try_to_activate_door(mob/user)
code/game/objects/items/storage/_storage.dm
+2 -2
View File
@@ -18,10 +18,10 @@
/obj/item/storage/AllowDrop()
return TRUE
/obj/item/storage/contents_explosion(severity, target)
/obj/item/storage/contents_explosion(severity, target, origin)
var/in_storage = istype(loc, /obj/item/storage)? (max(0, severity - 1)) : (severity)
for(var/atom/A in contents)
A.ex_act(in_storage, target)
A.ex_act(in_storage, target, origin)
CHECK_TICK
//Cyberboss says: "USE THIS TO FILL IT, NOT INITIALIZE OR NEW"