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

Vaurca Breeder Fixes (#17309)

Browse Source 
* Vaurca Breeder Fixes

* Remove Whitespace

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
This commit is contained in:
Geeves
2023-09-11 21:19:45 +00:00
committed by GitHub
co-authored by SleepyGemmy
parent 77df625c54
commit f34c28d945
6 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/background/citizenship/human.dm
+3 -2
View File
@@ -60,7 +60,7 @@
)
/datum/outfit/job/representative/consular/ceti/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H && !visualsOnly)
if(H)
if(isvaurca(H))
H.equip_to_slot_or_del(new /obj/item/clothing/under/gearharness(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/head/vaurca_breeder/biesel(H), slot_head)
@@ -71,7 +71,8 @@
H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_belt)
else
H.equip_to_slot_or_del(new /obj/item/gun/energy/blaster/revolver(H), slot_belt)
addtimer(CALLBACK(src, .proc/send_representative_mission, H), 5 MINUTES)
if(!visualsOnly)
addtimer(CALLBACK(src, .proc/send_representative_mission, H), 5 MINUTES)
return TRUE
/datum/citizenship/sol_alliance
code/modules/background/citizenship/skrell.dm
+4 -3
View File
@@ -73,7 +73,7 @@
uniform = /obj/item/clothing/under/skrell
/datum/outfit/job/representative/consular/nralakk/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H && !visualsOnly)
if(H)
if(isvaurca(H)) // there should be a system for this but for now this will have to do i guess
H.equip_to_slot_or_del(new /obj/item/clothing/under/gearharness(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/head/vaurca_breeder/nralakk(H), slot_head)
@@ -86,5 +86,6 @@
/obj/item/device/camera = 1,
/obj/item/gun/energy/psipistol = 1
)
addtimer(CALLBACK(src, PROC_REF(send_representative_mission), H), 5 MINUTES)
return TRUE
if(!visualsOnly)
addtimer(CALLBACK(src, PROC_REF(send_representative_mission), H), 5 MINUTES)
return TRUE
code/modules/background/citizenship/unathi.dm
+3 -2
View File
@@ -72,7 +72,7 @@
belt = /obj/item/gun/energy/pistol/hegemony
/datum/outfit/job/representative/consular/izweski/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H && !visualsOnly)
if(H)
if(isvaurca(H))
H.equip_to_slot_or_del(new /obj/item/clothing/under/gearharness(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/head/vaurca_breeder/hegemony(H), slot_head)
@@ -82,5 +82,6 @@
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec/klax(H), slot_back)
else
H.equip_to_slot_or_del(new /obj/item/clothing/accessory/poncho/unathimantle(H), slot_wear_suit)
addtimer(CALLBACK(src, .proc/send_representative_mission, H), 5 MINUTES)
if(!visualsOnly)
addtimer(CALLBACK(src, .proc/send_representative_mission, H), 5 MINUTES)
return TRUE
code/modules/background/citizenship/vaurca.dm
+9 -10
View File
@@ -63,14 +63,13 @@
suit = /obj/item/clothing/suit/vaurca/breeder
/datum/outfit/job/representative/consular/zora/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H && !visualsOnly)
if(H)
if(isvaurca(H))
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec(H), slot_back)
H.equip_to_slot_or_del(new /obj/item/storage/box/tcfl_pamphlet(H), slot_in_backpack)
H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_in_backpack)
addtimer(CALLBACK(src, PROC_REF(send_representative_mission), H), 5 MINUTES)
if(!visualsOnly)
addtimer(CALLBACK(src, PROC_REF(send_representative_mission), H), 5 MINUTES)
return TRUE
/datum/citizenship/klax
@@ -135,12 +134,11 @@
suit = /obj/item/clothing/suit/vaurca/breeder/klax
/datum/outfit/job/representative/consular/klax/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H && !visualsOnly)
if(H)
if(isvaurca(H))
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec/klax(H), slot_back)
addtimer(CALLBACK(src, PROC_REF(send_representative_mission), H), 5 MINUTES)
if(!visualsOnly)
addtimer(CALLBACK(src, PROC_REF(send_representative_mission), H), 5 MINUTES)
return TRUE
/datum/citizenship/cthur
@@ -206,8 +204,9 @@
suit = /obj/item/clothing/suit/vaurca/breeder/cthur
/datum/outfit/job/representative/consular/cthur/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H && !visualsOnly)
if(H)
if(isvaurca(H))
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec/cthur(H), slot_back)
addtimer(CALLBACK(src, PROC_REF(send_representative_mission), H), 5 MINUTES)
if(!visualsOnly)
addtimer(CALLBACK(src, PROC_REF(send_representative_mission), H), 5 MINUTES)
return TRUE
code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm
+4 -2
View File
@@ -114,8 +114,10 @@
/datum/species/bug/type_c/New()
..()
equip_adjust = list(
slot_l_hand_str = list("[NORTH]" = list("x" = 6, "y" = 8), "[EAST]" = list("x" = 15, "y" = 5), "[SOUTH]" = list("x" = 16, "y" = 8), "[WEST]" = list("x" = -9, "y" = 4)),
slot_r_hand_str = list("[NORTH]" = list("x" = 11, "y" = 8), "[EAST]" = list("x" = 25, "y" = 4), "[SOUTH]" = list("x" = 2, "y" = 8), "[WEST]" = list("x" = 1, "y" = 5))
slot_l_ear_str = list("[EAST]" = list("x" = 8, "y" = 10), "[SOUTH]" = list("x" = 9, "y" = 10), "[WEST]" = list("x" = -8, "y" = 10)),
slot_r_ear_str = list("[EAST]" = list("x" = 24, "y" = 10), "[SOUTH]" = list("x" = 7, "y" = 10), "[WEST]" = list("x" = -8, "y" = 10)),
slot_l_hand_str = list("[EAST]" = list("x" = 15, "y" = 5), "[SOUTH]" = list("x" = 10, "y" = 8), "[WEST]" = list("x" = -9, "y" = 4)),
slot_r_hand_str = list("[EAST]" = list("x" = 25, "y" = 4), "[SOUTH]" = list("x" = 4, "y" = 8), "[WEST]" = list("x" = 1, "y" = 5))
)
/datum/species/bug/type_c/handle_post_spawn(var/mob/living/carbon/human/H)