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

Merges upstream/dev to ref, resolves merge conflicts

Browse Source
This commit is contained in:
Amunak
2014-12-18 03:44:28 +01:00
parent d20ccdb6b4 fc203f186a
commit d28cb57f79
105 changed files with 1384 additions and 1109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/coathanger.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/coatrack.dmi'
icon_state = "coatrack0"
var/obj/item/clothing/suit/coat
var/list/allowed = list(/obj/item/clothing/suit/storage/labcoat, /obj/item/clothing/suit/storage/det_suit)
var/list/allowed = list(/obj/item/clothing/suit/storage/labcoat, /obj/item/clothing/suit/storage/toggle/labcoat, /obj/item/clothing/suit/storage/det_suit)
/obj/structure/coatrack/attack_hand(mob/user as mob)
user.visible_message("[user] takes [coat] off \the [src].", "You take [coat] off the \the [src]")
code/game/objects/structures/tables_racks.dm
+5
View File
@@ -353,6 +353,9 @@
if(isrobot(user))
return
if(W.loc != user) // This should stop mounted modules ending up outside the module.
return
if(istype(W, /obj/item/weapon/melee/energy/blade))
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, src.loc)
@@ -582,6 +585,8 @@
return
if(isrobot(user))
return
if(W.loc != user) // This should stop mounted modules ending up outside the module.
return
user.drop_item()
if(W && W.loc) W.loc = src.loc
return
code/game/objects/structures/transit_tubes.dm
+1 -1
View File
@@ -117,7 +117,7 @@ obj/structure/ex_act(severity)
if(!pod_moving && icon_state == "open" && istype(AM, /mob))
for(var/obj/structure/transit_tube_pod/pod in loc)
if(pod.contents.len)
AM << "<span class=The pod is already occupied.</span>"
AM << "<span class='notice'>The pod is already occupied.</span>"
return
else if(!pod.moving && pod.dir in directions())
AM.loc = pod