cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 14:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revives "Updates ERT gear and adds holo stretcher #16266" (#18139)

Browse Source 
* Updates ERT gear

* Apply suggestions from code review

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Reformats new vars

* Update code/game/objects/items/weapons/storage/boxes.dm

Code Clarity

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* Removes unneeded item

* BULK

* repath time

* moxian review

* le beds

* haha webedits

* bubble review

Co-authored-by: warior4356 <warior4356@yahoo.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
This commit is contained in:
S34N
2022-07-05 18:47:20 +02:00
committed by GitHub
co-authored by SteelSlayer SabreML warior4356
parent a1cc619421
commit 1ad219e02a
9 changed files with 85 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+28 -6
View File
@@ -81,6 +81,9 @@
resistance_flags = NONE
anchored = FALSE
comfort = 1
var/icon_up = "up"
var/icon_down = "down"
var/folded = /obj/item/roller
/obj/structure/bed/roller/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/roller_holder))
@@ -92,30 +95,38 @@
user_unbuckle_mob(buckled_mobs[1], user)
else
user.visible_message("<span class='notice'>[user] collapses \the [name].</span>", "<span class='notice'>You collapse \the [name].</span>")
new/obj/item/roller(get_turf(src))
new folded(get_turf(src))
qdel(src)
else
return ..()
/obj/structure/bed/roller/post_buckle_mob(mob/living/M)
density = TRUE
icon_state = "up"
icon_state = icon_up
..()
/obj/structure/bed/roller/post_unbuckle_mob(mob/living/M)
density = FALSE
icon_state = "down"
icon_state = icon_down
..()
/obj/structure/bed/roller/holo
name = "holo stretcher"
icon_state = "holo_extended"
icon_up = "holo_extended"
icon_down = "holo_extended"
folded = /obj/item/roller/holo
/obj/item/roller
name = "roller bed"
desc = "A collapsed roller bed that can be carried around."
icon = 'icons/obj/rollerbed.dmi'
icon_state = "folded"
w_class = WEIGHT_CLASS_NORMAL
w_class = WEIGHT_CLASS_BULKY
var/extended = /obj/structure/bed/roller
/obj/item/roller/attack_self(mob/user)
var/obj/structure/bed/roller/R = new /obj/structure/bed/roller(user.loc)
var/obj/structure/bed/roller/R = new extended(user.loc)
R.add_fingerprint(user)
qdel(src)
@@ -137,6 +148,17 @@
forceMove(RH)
RH.held = src
/obj/item/roller/holo
name = "holo stretcher"
desc = "A retracted hardlight stretcher that can be carried around."
icon_state = "holo_retracted"
w_class = WEIGHT_CLASS_SMALL
origin_tech = "magnets=3;biotech=4;powerstorage=3"
extended = /obj/structure/bed/roller/holo
/obj/item/roller/holo/attackby(obj/item/W, mob/user, params)
return
/obj/structure/bed/roller/MouseDrop(over_object, src_location, over_location)
..()
if(over_object == usr && Adjacent(usr) && (in_range(src, usr) || usr.contents.Find(src)))
@@ -145,7 +167,7 @@
if(has_buckled_mobs())
return 0
usr.visible_message("<span class='notice'>[usr] collapses \the [name].</span>", "<span class='notice'>You collapse \the [name].</span>")
new/obj/item/roller(get_turf(src))
new folded(get_turf(src))
qdel(src)
/obj/item/roller_holder