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

Completely removes Vox from the game. (#10028)

Browse Source
This commit is contained in:
Matt Atlas
2020-10-07 13:52:08 +02:00
committed by GitHub
parent 93fdb224b4
commit b65a598b85
44 changed files with 108 additions and 801 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/boxes.dm
-3
View File
@@ -137,9 +137,6 @@
for(var/obj/item/thing in contents)
thing.autodrobe_no_remove = 1
/obj/item/storage/box/vox
starts_with = list(/obj/item/clothing/mask/breath = 1, /obj/item/tank/emergency_nitrogen = 1)
/obj/item/storage/box/engineer
autodrobe_no_remove = 1
starts_with = list(/obj/item/clothing/mask/breath = 1, /obj/item/tank/emergency_oxygen/engi = 1)
code/game/objects/items/weapons/vaurca_items.dm
+2 -12
View File
@@ -143,15 +143,6 @@
user.put_in_hands(X)
qdel(src)
else if(isvox(user))
to_chat(user, "<span class='notice'>You are surprised to recognize the markings of the Apex, the Masters! You know this thing... (You must stand still to complete the puzzle box.)</span>")
if(do_after(user, 100))
to_chat(user, "<span class='notice'>After a few seconds of remembering, you input the solution to the riddle - a lovely riddle indeed - and open the box to reveal an ancient thing.</span>")
var/obj/item/archaeological_find/X = new /obj/item/archaeological_find
user.remove_from_mob(src)
user.put_in_hands(X)
qdel(src)
else
to_chat(user, "<span class='notice'>You stare at the box for a few seconds, trying to even comprehend what you're looking at... (You must stand still to complete the puzzle box.)</span>")
if(do_after(user, 60))
@@ -225,7 +216,7 @@
species_restricted = list(BODYTYPE_VAURCA)
boots = /obj/item/clothing/shoes/magboots/vox/vaurca
boots = /obj/item/clothing/shoes/magboots/vaurca
helmet = /obj/item/clothing/head/helmet/space/void/vaurca
/obj/item/clothing/head/helmet/space/void/vaurca
@@ -241,8 +232,7 @@
light_overlay = "helmet_light_dual_green"
light_color = "#3e7c3e"
/obj/item/clothing/shoes/magboots/vox/vaurca
/obj/item/clothing/shoes/magboots/vaurca
desc = "A pair of heavy mag-claws designed for a Vaurca."
name = "mag-claws"
item_state = "boots_void"
code/game/objects/random/random.dm
+1 -21
View File
@@ -510,30 +510,10 @@
new helmet(loc)
else
log_debug("random_obj (voidsuit): Type [suit.type] was unable to spawn a matching helmet!")
if(!for_vox)
new /obj/item/clothing/shoes/magboots(loc)
else
new /obj/item/clothing/shoes/magboots/vox(loc)
new /obj/item/clothing/gloves/yellow/vox(loc)
new /obj/item/clothing/shoes/magboots(loc)
if (damaged && prob(60))
suit.create_breaches(pick(BRUTE, BURN), rand(1, 5))
/obj/random/voidsuit/vox
name = "random vox voidsuit"
for_vox = TRUE
suitmap = list(
/obj/item/clothing/suit/space/vox/carapace = /obj/item/clothing/head/helmet/space/vox/carapace,
/obj/item/clothing/suit/space/vox/medic = /obj/item/clothing/head/helmet/space/vox/medic,
/obj/item/clothing/suit/space/vox/pressure = /obj/item/clothing/head/helmet/space/vox/pressure,
/obj/item/clothing/suit/space/vox/stealth = /obj/item/clothing/head/helmet/space/vox/stealth
)
problist = list(
/obj/item/clothing/suit/space/vox/carapace = 1,
/obj/item/clothing/suit/space/vox/medic = 1,
/obj/item/clothing/suit/space/vox/pressure = 1,
/obj/item/clothing/suit/space/vox/stealth = 1
)
/obj/random/vendor
name = "random vendor"
var/depleted = FALSE
code/game/objects/structures/mirror.dm
-50
View File
@@ -74,34 +74,6 @@
ui_users.Cut()
return ..()
// The following mirror is ~special~.
/obj/structure/mirror/raider
name = "cracked mirror"
desc = "Something seems strange about this old, dirty mirror. Your reflection doesn't look like you remember it."
icon_state = "mirror_broke"
shattered = 1
/obj/structure/mirror/raider/attack_hand(var/mob/living/carbon/human/user)
if(istype(get_area(src),/area/antag))
if(istype(user) && user.mind && user.mind.special_role == "Raider" && user.species.name != SPECIES_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")
var/mob/living/carbon/human/vox/vox = new(get_turf(src),SPECIES_VOX)
vox.gender = user.gender
raiders.equip(vox)
if(user.mind)
user.mind.transfer_to(vox)
spawn(1)
var/newname = sanitizeSafe(input(vox,"Enter a name, or leave blank for the default name.", "Name change","") as text, MAX_NAME_LEN)
if(!newname || newname == "")
newname = user.species.get_random_name()
vox.real_name = newname
vox.name = vox.real_name
raiders.update_access(vox)
vox.faction = "syndicate" //so the vox is not attacked by viscerator
qdel(user)
..()
/obj/item/mirror
name = "mirror"
desc = "A SalonPro Nano-Mirror(TM) brand mirror! Now a portable version."
@@ -129,25 +101,3 @@
qdel(AC)
ui_users.Cut()
return ..()
//merchant mirror, turns you into a vox
/obj/structure/mirror/merchant
name = "cracked mirror"
desc = "Something seems strange about this old, dirty mirror. Your reflection doesn't look like you remember it."
icon_state = "mirror_broke"
shattered = 1
/obj/structure/mirror/merchant/attack_hand(var/mob/living/carbon/human/user)
if(istype(get_area(src),/area/merchant_station))
if(istype(user) && user.mind && (user.mind.assigned_role == "Merchant" || user.mind.assigned_role == "Merchants Assistant") && user.species.name != SPECIES_VOX)
var/choice = input("Do you wish to become a Vox? This is not reversible.") as null|anything in list("No","Yes")
if(choice == "Yes")
user.set_species(SPECIES_VOX)
user.species.before_equip(user)
var/newname = sanitizeSafe(input(user,"Enter a name, or leave blank for the default name.", "Name change","") as text, MAX_NAME_LEN)
if(!newname || newname == "")
newname = user.species.get_random_name()
user.fully_replace_character_name(user.real_name,newname)
..()