cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 21:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into placeholder

Browse Source
This commit is contained in:
Ferner
2021-03-07 20:50:42 +01:00
parent 5791762536 0a80d0053f
commit 689605118a
88 changed files with 713 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/fitness.dm
-30
View File
@@ -43,33 +43,3 @@
new /obj/item/clothing/mask/luchador(src)
new /obj/item/clothing/mask/luchador/rudos(src)
new /obj/item/clothing/mask/luchador/tecnicos(src)
/obj/structure/closet/lasertag/red
name = "red laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
icon_state = "red"
icon_closed = "red"
/obj/structure/closet/lasertag/red/fill()
new /obj/item/clothing/ears/earmuffs(src)
new /obj/item/clothing/ears/earmuffs(src)
new /obj/item/gun/energy/lasertag/red(src)
new /obj/item/gun/energy/lasertag/red(src)
new /obj/item/clothing/suit/redtag(src)
new /obj/item/clothing/suit/redtag(src)
/obj/structure/closet/lasertag/blue
name = "blue laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
icon_state = "blue"
icon_closed = "blue"
/obj/structure/closet/lasertag/blue/fill()
new /obj/item/clothing/ears/earmuffs(src)
new /obj/item/clothing/ears/earmuffs(src)
new /obj/item/gun/energy/lasertag/blue(src)
new /obj/item/gun/energy/lasertag/blue(src)
new /obj/item/clothing/suit/bluetag(src)
new /obj/item/clothing/suit/bluetag(src)
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+2 -2
View File
@@ -261,7 +261,7 @@
/obj/structure/bed/roller/attackby(obj/item/I, mob/user)
if(iswrench(I) || istype(I, /obj/item/stack) || iswirecutter(I))
return 1
if(iv_stand && !beaker && istype(I, /obj/item/reagent_containers))
if(iv_stand && !beaker && (istype(I, /obj/item/reagent_containers/glass/beaker) || istype(I, /obj/item/reagent_containers/blood)))
if(!user.unEquip(I, target = src))
return
to_chat(user, SPAN_NOTICE("You attach \the [I] to \the [src]."))
@@ -318,7 +318,7 @@
..()
if(use_check(usr) || !Adjacent(usr))
return
if(!(ishuman(usr) || isrobot(usr)))
if(!ishuman(usr))
return
if(over_object == buckled && beaker)
if(iv_attached)
code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
+6 -5
View File
@@ -210,11 +210,12 @@
/obj/structure/bed/chair/wheelchair/MouseDrop(over_object, src_location, over_location)
..()
if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src))))
if(!ishuman(usr))
return FALSE
if(buckled)
return FALSE
if(!ishuman(usr))
return FALSE
if(buckled)
return FALSE
if(!usr.Adjacent(src))
return FALSE
visible_message(SPAN_NOTICE("[usr] collapses [src]."))
var/obj/item/wheelchair/R = new(get_turf(src))
R.name = src.name