cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 22:12:58 +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/buckling.dm
+4 -4
View File
@@ -41,11 +41,11 @@
M.facing_dir = null
M.update_canmove()
else
MA.anchored = TRUE
MA.anchored = TRUE
else
return 0
post_buckle(MA)
MA.layer = src.layer + 1
MA.layer = src.layer + 0.1
return 1
/obj/proc/unbuckle()
@@ -91,8 +91,8 @@
"<span class='notice'>You hear metal clanking.</span>")
else
MA.visible_message(\
"<span class='danger'>[MA.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'>[MA.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>")
/obj/proc/user_unbuckle(mob/user)
code/game/objects/effects/spiders.dm
+3 -3
View File
@@ -1,7 +1,7 @@
//generic procs copied from obj/effect/alien
/obj/effect/spider
name = "web"
desc = "It's stringy and sticky, eugh. Probably came from one of those giant spiders..."
desc = "It's stringy and sticky, eugh. Probably came from one of those greimorians..."
icon = 'icons/effects/effects.dmi'
anchored = TRUE
density = FALSE
@@ -321,14 +321,14 @@
qdel(O)
/obj/effect/decal/cleanable/spiderling_remains
name = "spiderling remains"
name = "greimorian larva remains"
desc = "Green squishy mess."
icon = 'icons/effects/effects.dmi'
icon_state = "greenshatter"
/obj/effect/spider/cocoon
name = "cocoon"
desc = "Something wrapped in silky spider web"
desc = "Something wrapped in silky greimorian web"
icon_state = "cocoon1"
health = 60
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)