cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-20 19:43:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into placeholder

Browse Source
This commit is contained in:
Ferner
2021-02-20 03:12:27 +01:00
parent 2307beaff6 9b593b9a08
commit 77e2b692e5
43 changed files with 225 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/plasticflaps.dm
+1 -1
View File
@@ -24,7 +24,7 @@
return prob(60)
var/obj/structure/bed/B = A
if (istype(A, /obj/structure/bed) && B.buckled)//if it's a bed/chair and someone is buckled_to, it will not pass
if (istype(A, /obj/structure/bed) && B.buckled)//if it's a bed/chair and someone is buckled, it will not pass
return 0
if(istype(A, /obj/vehicle)) //no vehicles
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+2 -2
View File
@@ -157,8 +157,8 @@
spawn(0)
if(buckle(affecting))
affecting.visible_message(\
"<span class='danger'>[affecting.name] is buckled_to to [src] by [user.name]!</span>",\
"<span class='danger'>You are buckled_to to [src] by [user.name]!</span>",\
"<span class='danger'>[affecting.name] is buckled to [src] by [user.name]!</span>",\
"<span class='danger'>You are buckled to [src] by [user.name]!</span>",\
"<span class='notice'>You hear metal clanking.</span>")
qdel(W)