mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-25 14:00:18 +01:00
CC-zlevel flattening, Antag base refurbishment, bugfixes and more (#9686)
This commit is contained in:
fernerr
@@ -690,7 +690,10 @@
|
||||
"critter" = "critteropen",
|
||||
"largemetal" = "largemetalopen",
|
||||
"medicalcrate" = "medicalcrateopen",
|
||||
"tcflcrate" = "tcflcrateopen"
|
||||
"tcflcrate" = "tcflcrateopen",
|
||||
"necrocrate" = "necrocrateopen",
|
||||
"zenghucrate" = "zenghucrateopen",
|
||||
"hephcrate" = "hephcrateopen"
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -24,6 +24,21 @@
|
||||
var/driving
|
||||
var/mob/living/pulling
|
||||
|
||||
/obj/structure/janitorialcart/full/Initialize()
|
||||
..()
|
||||
mybag = new /obj/item/storage/bag/trash(src)
|
||||
mymop = new /obj/item/mop(src)
|
||||
myspray = new /obj/item/reagent_containers/spray/cleaner(src)
|
||||
myreplacer = new /obj/item/device/lightreplacer(src)
|
||||
|
||||
mybucket = new /obj/structure/mopbucket(src)
|
||||
mybucket.reagents.add_reagent(/datum/reagent/water, mybucket.bucketsize)
|
||||
|
||||
for(signs, signs < 4, signs++)
|
||||
new /obj/item/clothing/suit/caution(src)
|
||||
|
||||
update_icon()
|
||||
|
||||
/obj/structure/janitorialcart/New()
|
||||
..()
|
||||
janitorial_supplies |= src
|
||||
|
||||
@@ -82,7 +82,7 @@
|
||||
shattered = 1
|
||||
|
||||
/obj/structure/mirror/raider/attack_hand(var/mob/living/carbon/human/user)
|
||||
if(istype(get_area(src),/area/syndicate_mothership))
|
||||
if(istype(get_area(src),/area/antag))
|
||||
if(istype(user) && user.mind && user.mind.special_role == "Raider" && user.species.name != "Vox")
|
||||
var/choice = input("Do you wish to become a true Vox of the Shoal? This is not reversible.") as null|anything in list("No","Yes")
|
||||
if(choice && choice == "Yes")
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
/obj/structure/shotgun_rack
|
||||
name = "shotgun rack"
|
||||
desc = "A wooden rack designated to store shotguns."
|
||||
icon = 'icons/obj/shotgunrack.dmi'
|
||||
icon_state = "shotgun_rack"
|
||||
anchored = 1
|
||||
density = 0
|
||||
|
||||
var/obj/item/gun/projectile/shotgun/rack_shotgun
|
||||
|
||||
/obj/structure/shotgun_rack/attackby(obj/item/O, mob/user)
|
||||
if(isrobot(user))
|
||||
return
|
||||
if(istype(O, /obj/item/gun/projectile/shotgun) && O.w_class != 3) //w_class check is to stop people from placing a sawn off shotgun here
|
||||
if(!rack_shotgun)
|
||||
user.unEquip(O)
|
||||
O.forceMove(src)
|
||||
rack_shotgun = O
|
||||
to_chat(user, "<span class='notice'>You place \the [O] in \the [src].</span>")
|
||||
icon_state = "shotgun_rack_[O.icon_state]"
|
||||
|
||||
/obj/structure/shotgun_rack/attack_hand(mob/user)
|
||||
if(isrobot(user))
|
||||
return
|
||||
if (!user.can_use_hand())
|
||||
return
|
||||
if(rack_shotgun)
|
||||
user.put_in_hands(rack_shotgun)
|
||||
to_chat(user, "<span class='notice'>You take \the [rack_shotgun] from \the [src].</span>")
|
||||
rack_shotgun = null
|
||||
icon_state = "shotgun_rack"
|
||||
|
||||
/obj/structure/shotgun_rack/do_simple_ranged_interaction(var/mob/user)
|
||||
if(rack_shotgun)
|
||||
rack_shotgun.forceMove(loc)
|
||||
to_chat(user, "<span class='notice'>You telekinetically remove \the [rack_shotgun] from \the [src].</span>")
|
||||
rack_shotgun = null
|
||||
icon_state = "shotgun_rack"
|
||||
|
||||
//premade types
|
||||
|
||||
/obj/structure/shotgun_rack/double
|
||||
icon_state = "shotgun_rack_dshotgun"
|
||||
|
||||
/obj/structure/shotgun_rack/double/Initialize()
|
||||
. = ..()
|
||||
rack_shotgun = new/obj/item/gun/projectile/shotgun/doublebarrel(src)
|
||||
|
||||
/obj/structure/shotgun_rack/double_pellet
|
||||
icon_state = "shotgun_rack_dshotgun"
|
||||
|
||||
/obj/structure/shotgun_rack/double_pellet/Initialize()
|
||||
. = ..()
|
||||
rack_shotgun = new/obj/item/gun/projectile/shotgun/doublebarrel/pellet(src)
|
||||
|
||||
|
||||
/obj/structure/shotgun_rack/pump
|
||||
icon_state = "shotgun_rack_shotgun"
|
||||
|
||||
/obj/structure/shotgun_rack/pump/Initialize()
|
||||
. = ..()
|
||||
rack_shotgun = new/obj/item/gun/projectile/shotgun/pump(src)
|
||||
|
||||
/obj/structure/shotgun_rack/combat
|
||||
icon_state = "shotgun_rack_cshotgun"
|
||||
|
||||
/obj/structure/shotgun_rack/combat/Initialize()
|
||||
. = ..()
|
||||
rack_shotgun = new/obj/item/gun/projectile/shotgun/pump/combat(src)
|
||||
|
||||
/obj/structure/shotgun_rack/improvised
|
||||
icon_state = "shotgun_rack_ishotgun"
|
||||
|
||||
/obj/structure/shotgun_rack/improvised/Initialize()
|
||||
. = ..()
|
||||
rack_shotgun = new/obj/item/gun/projectile/shotgun/improvised(src)
|
||||
@@ -184,12 +184,16 @@
|
||||
desc = "A warning sign which reads 'HYDROPONICS'."
|
||||
icon_state = "hydro1"
|
||||
|
||||
|
||||
/obj/structure/sign/patients_only
|
||||
name = "\improper PATIENTS ONLY"
|
||||
desc = "A big blue sign that reads 'PATIENTS ONLY'. Underneath you can read: 'Authorized personnel only. Tresspassers will be prosecuted by the security department.'"
|
||||
icon_state = "patients_only"
|
||||
|
||||
/obj/structure/sign/staff_only
|
||||
name = "\improper STAFF ONLY"
|
||||
desc = "A big blue sign that reads 'STAFF ONLY'"
|
||||
icon_state = "staff_only"
|
||||
|
||||
//Location and direction signs
|
||||
/obj/structure/sign/directions
|
||||
name = "direction sign"
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
/obj/structure/weapon_rack
|
||||
name = "weapon rack"
|
||||
desc = "A wooden rack designated to store weapons."
|
||||
icon = 'icons/obj/weaponrack.dmi'
|
||||
icon_state = "rack"
|
||||
anchored = TRUE
|
||||
density = FALSE
|
||||
|
||||
var/obj/item/held_weapon
|
||||
|
||||
/obj/structure/weapon_rack/Initialize()
|
||||
if(held_weapon)
|
||||
held_weapon = new held_weapon(src)
|
||||
icon_state = initial(icon_state) + "_[held_weapon.icon_state]"
|
||||
|
||||
/obj/structure/weapon_rack/attackby(obj/item/W, mob/user)
|
||||
if(isrobot(user))
|
||||
return
|
||||
if((initial(icon_state) + "_[W.icon_state]") in icon_states(icon))
|
||||
user.unEquip(W)
|
||||
W.forceMove(src)
|
||||
held_weapon = W
|
||||
to_chat(user, SPAN_NOTICE("You place \the [W] on \the [src]."))
|
||||
icon_state = initial(icon_state) + "_[W.icon_state]"
|
||||
else
|
||||
to_chat(user, SPAN_NOTICE("[W] does not fit on \the [src]."))
|
||||
|
||||
/obj/structure/weapon_rack/attack_hand(mob/user)
|
||||
if(isrobot(user))
|
||||
return
|
||||
if (!user.can_use_hand())
|
||||
return
|
||||
if(held_weapon)
|
||||
user.put_in_hands(held_weapon)
|
||||
to_chat(user, SPAN_NOTICE("You take \the [held_weapon] from \the [src]."))
|
||||
held_weapon = null
|
||||
icon_state = initial(icon_state)
|
||||
|
||||
/obj/structure/weapon_rack/do_simple_ranged_interaction(var/mob/user)
|
||||
if(held_weapon)
|
||||
held_weapon.forceMove(loc)
|
||||
to_chat(user, SPAN_NOTICE("You telekinetically remove \the [held_weapon] from \the [src]."))
|
||||
held_weapon = null
|
||||
icon_state = initial(icon_state)
|
||||
|
||||
// Premade types
|
||||
|
||||
/obj/structure/weapon_rack/double
|
||||
held_weapon = /obj/item/gun/projectile/shotgun/doublebarrel
|
||||
|
||||
/obj/structure/weapon_rack/double_pellet
|
||||
held_weapon = /obj/item/gun/projectile/shotgun/doublebarrel/pellet
|
||||
|
||||
/obj/structure/weapon_rack/pump
|
||||
held_weapon = /obj/item/gun/projectile/shotgun/pump
|
||||
|
||||
/obj/structure/weapon_rack/combat
|
||||
held_weapon = /obj/item/gun/projectile/shotgun/pump/combat
|
||||
|
||||
/obj/structure/weapon_rack/improvised
|
||||
held_weapon = /obj/item/gun/projectile/shotgun/improvised
|
||||
|
||||
/obj/structure/weapon_rack/dragunov
|
||||
name = "antique sniper rifle rack"
|
||||
desc = "A wooden rack holding an old sniper rifle. Still packs a punch."
|
||||
held_weapon = /obj/item/gun/projectile/dragunov
|
||||
Reference in New Issue
Block a user