cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 10:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes Several Holodeck Infinite Materials Exploits (#3057)

Browse Source 
* Fixes Several Holodeck Infinite Materials Exploits (#56587)

* Fixes Several Holodeck Infinite Materials Exploits

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
This commit is contained in:
SkyratBot
2021-02-04 01:14:40 +01:00
committed by GitHub
parent 7499bd162a
commit dcb4dede41
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/machinery/washing_machine.dm
View File

@@ -349,7 +349,8 @@ GLOBAL_LIST_INIT(dye_registry, list(
update_icon() update_icon()
/obj/machinery/washing_machine/deconstruct(disassembled = TRUE) /obj/machinery/washing_machine/deconstruct(disassembled = TRUE)
new /obj/item/stack/sheet/metal(drop_location(), 2) if (!(flags_1 & NODECONSTRUCT_1))
new /obj/item/stack/sheet/metal(drop_location(), 2)
qdel(src) qdel(src)
/obj/machinery/washing_machine/open_machine(drop = 1) /obj/machinery/washing_machine/open_machine(drop = 1)

2
code/game/objects/items/crayons.dm
View File

@@ -632,6 +632,8 @@
if(contents.len > 0) if(contents.len > 0)
to_chat(user, "<span class='warning'>You can't fold down [src] with crayons inside!</span>") to_chat(user, "<span class='warning'>You can't fold down [src] with crayons inside!</span>")
return return
if(flags_1 & HOLOGRAM_1)
return
var/obj/item/stack/sheet/cardboard/cardboard = new /obj/item/stack/sheet/cardboard(user.drop_location()) var/obj/item/stack/sheet/cardboard/cardboard = new /obj/item/stack/sheet/cardboard(user.drop_location())
to_chat(user, "<span class='notice'>You fold the [src] into cardboard.</span>") to_chat(user, "<span class='notice'>You fold the [src] into cardboard.</span>")

2
code/game/objects/items/storage/boxes.dm
View File

@@ -57,7 +57,7 @@
/obj/item/storage/box/attack_self(mob/user) /obj/item/storage/box/attack_self(mob/user)
..() ..()
if(!foldable) if(!foldable || (flags_1 & HOLOGRAM_1))
return return
if(contents.len) if(contents.len)
to_chat(user, "<span class='warning'>You can't fold this box with items still inside!</span>") to_chat(user, "<span class='warning'>You can't fold this box with items still inside!</span>")

3
code/game/objects/structures/morgue.dm
View File

@@ -101,7 +101,8 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an
return ..() return ..()
/obj/structure/bodycontainer/deconstruct(disassembled = TRUE) /obj/structure/bodycontainer/deconstruct(disassembled = TRUE)
new /obj/item/stack/sheet/metal (loc, 5) if (!(flags_1 & NODECONSTRUCT_1))
new /obj/item/stack/sheet/metal (loc, 5)
recursive_organ_check(src) recursive_organ_check(src)
qdel(src) qdel(src)

2
code/modules/library/lib_items.dm
View File

@@ -317,7 +317,7 @@
scanner.computer.inventory.Add(src) scanner.computer.inventory.Add(src)
to_chat(user, "<span class='notice'>[I]'s screen flashes: 'Book stored in buffer. Title added to general inventory.'</span>") to_chat(user, "<span class='notice'>[I]'s screen flashes: 'Book stored in buffer. Title added to general inventory.'</span>")
else if(istype(I, /obj/item/kitchen/knife) || I.tool_behaviour == TOOL_WIRECUTTER) else if((istype(I, /obj/item/kitchen/knife) || I.tool_behaviour == TOOL_WIRECUTTER) && !(flags_1 & HOLOGRAM_1))
to_chat(user, "<span class='notice'>You begin to carve out [title]...</span>") to_chat(user, "<span class='notice'>You begin to carve out [title]...</span>")
if(do_after(user, 30, target = src)) if(do_after(user, 30, target = src))
to_chat(user, "<span class='notice'>You carve out the pages from [title]! You didn't want to read it anyway.</span>") to_chat(user, "<span class='notice'>You carve out the pages from [title]! You didn't want to read it anyway.</span>")