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

Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760

Browse Source 
[MIRROR] Fixed stacks sometimes having the wrong amount if created on another stack
This commit is contained in:
LetterJay
2018-05-14 12:28:41 -05:00
committed by GitHub
parent 5f25c8c5f7 c92a18f733
commit f9f42658e1
24 changed files with 171 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/xenobiology/crossbreeding/_status_effects.dm
+1 -2
View File
@@ -448,8 +448,7 @@ datum/status_effect/stabilized/blue/on_remove()
else if(istype(O, /obj/item/stack/sheet/hairlesshide))
to_chat(owner, "<span class='warning'>[linked_extract] kept your hands wet! It wets [O]!</span>")
var/obj/item/stack/sheet/hairlesshide/HH = O
var/obj/item/stack/sheet/wetleather/WL = new(get_turf(HH))
WL.amount = HH.amount
new /obj/item/stack/sheet/wetleather(get_turf(HH), HH.amount)
qdel(HH)
..()
code/modules/research/xenobiology/crossbreeding/charged.dm
+5 -10
View File
@@ -66,10 +66,8 @@ Charged extracts:
colour = "metal"
/obj/item/slimecross/charged/metal/do_effect(mob/user)
var/obj/item/stack/sheet/metal/M = new(get_turf(user))
M.amount = 25
var/obj/item/stack/sheet/plasteel/P = new(get_turf(user))
P.amount = 10
new /obj/item/stack/sheet/metal(get_turf(user), 25)
new /obj/item/stack/sheet/plasteel(get_turf(user), 10)
user.visible_message("<span class='notice'>[src] grows into a plethora of metals!</span>")
..()
@@ -85,8 +83,7 @@ Charged extracts:
colour = "dark purple"
/obj/item/slimecross/charged/darkpurple/do_effect(mob/user)
var/obj/item/stack/sheet/mineral/plasma/M = new(get_turf(user))
M.amount = 10
new /obj/item/stack/sheet/mineral/plasma(get_turf(user), 10)
user.visible_message("<span class='notice'>[src] produces a large amount of plasma!</span>")
..()
@@ -113,8 +110,7 @@ Charged extracts:
colour = "bluespace"
/obj/item/slimecross/charged/bluespace/do_effect(mob/user)
var/obj/item/stack/sheet/bluespace_crystal/M = new(get_turf(user))
M.amount = 10
new /obj/item/stack/sheet/bluespace_crystal(get_turf(user), 10)
user.visible_message("<span class='notice'>[src] produces several sheets of polycrystal!</span>")
..()
@@ -138,8 +134,7 @@ Charged extracts:
colour = "pyrite"
/obj/item/slimecross/charged/pyrite/do_effect(mob/user)
var/obj/item/stack/sheet/mineral/bananium/M = new(get_turf(user))
M.amount = 10
new /obj/item/stack/sheet/mineral/bananium(get_turf(user), 10)
user.visible_message("<span class='warning'>[src] solidifies with a horrifying banana stench!</span>")
..()
code/modules/research/xenobiology/crossbreeding/industrial.dm
+1 -6
View File
@@ -75,12 +75,7 @@ Industrial extracts:
/obj/item/slimecross/industrial/metal
colour = "metal"
plasmarequired = 3
itempath = /obj/item/stack/sheet/metal
/obj/item/slimecross/industrial/metal/do_after_spawn(obj/item/spawned)
var/obj/item/stack/sheet/metal/M = spawned
if(istype(M))
M.amount = 10
itempath = /obj/item/stack/sheet/metal/ten
/obj/item/slimecross/industrial/yellow
colour = "yellow"