cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 12:08:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Finishing touches on outfit code

Browse Source
This commit is contained in:
Anewbe
2017-10-04 21:55:55 -05:00
parent 82f24079f4
commit 152cf3362c
9 changed files with 81 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/outfits/jobs/civilian.dm
+2 -2
View File
@@ -21,11 +21,11 @@
uniform = /obj/item/clothing/under/rank/bartender
id_type = /obj/item/weapon/card/id/civilian/bartender
pda_type = /obj/item/device/pda/bar
backpack_contents = list(/obj/item/weapon/permit/gun/bar = 1)
backpack_contents = list(/obj/item/clothing/accessory/permit/gun/bar = 1)
/decl/hierarchy/outfit/job/service/bartender/post_equip(mob/living/carbon/human/H)
..()
for(var/obj/item/weapon/permit/gun/bar/permit in H.back.contents)
for(var/obj/item/clothing/accessory/permit/gun/bar/permit in H.back.contents)
permit.set_name(H.real_name)
/decl/hierarchy/outfit/job/service/bartender/barista
code/datums/outfits/jobs/medical.dm
-1
View File
@@ -57,7 +57,6 @@
head = /obj/item/clothing/head/nursehat
else
uniform = /obj/item/clothing/under/rank/medical/scrubs/purple
head = /obj/item/clothing/head/nursehat
..()
/decl/hierarchy/outfit/job/medical/chemist
code/datums/outfits/military/fleet.dm
+22
View File
@@ -0,0 +1,22 @@
/decl/hierarchy/outfit/military/fleet/pt
name = "Fleet Uniform - PT"
uniform = /obj/item/clothing/under/pt/fleet
shoes = /obj/item/clothing/shoes/black
/decl/hierarchy/outfit/military/fleet/utility
name = "Fleet Uniform - Utility"
uniform = /obj/item/clothing/under/utility/fleet
shoes = /obj/item/clothing/shoes/boots/jackboots
/decl/hierarchy/outfit/military/fleet/service
name = "Fleet Uniform - Service"
uniform = /obj/item/clothing/under/service/fleet
shoes = /obj/item/clothing/shoes/dress/white
/decl/hierarchy/outfit/military/fleet/dress
name = "Fleet Uniform - Dress"
uniform = /obj/item/clothing/under/service/fleet
shoes = /obj/item/clothing/shoes/dress/white
suit = /obj/item/clothing/suit/storage/toggle/dress/fleet
gloves = /obj/item/clothing/gloves/white
head = /obj/item/clothing/head/dress/fleet
code/datums/outfits/military/marines.dm
+23
View File
@@ -0,0 +1,23 @@
/decl/hierarchy/outfit/military/marine/pt
name = "Marine Uniform - PT"
uniform = /obj/item/clothing/under/pt/marine
shoes = /obj/item/clothing/shoes/black
/decl/hierarchy/outfit/military/marine/utility
name = "Marine Uniform - Utility"
uniform = /obj/item/clothing/under/utility/marine
shoes = /obj/item/clothing/shoes/boots/jungle
/decl/hierarchy/outfit/military/marine/service
name = "Marine Uniform - Service"
uniform = /obj/item/clothing/under/service/marine
shoes = /obj/item/clothing/shoes/dress
suit = /obj/item/clothing/suit/storage/service/marine
/decl/hierarchy/outfit/military/marine/dress
name = "Marine Uniform - Dress"
uniform = /obj/item/clothing/under/mildress/marine
shoes = /obj/item/clothing/shoes/dress/white
suit = /obj/item/clothing/suit/dress/marine
gloves = /obj/item/clothing/gloves/white
head = /obj/item/clothing/head/dress/marine
code/datums/outfits/military/military.dm
+5
View File
@@ -0,0 +1,5 @@
/decl/hierarchy/outfit/military
name = "Military Uniform"
hierarchy_type = /decl/hierarchy/outfit/military
l_ear = /obj/item/device/radio/headset
code/datums/outfits/military/sifguard.dm
+23
View File
@@ -0,0 +1,23 @@
/decl/hierarchy/outfit/military/sifguard/pt
name = "SifGuard Uniform - PT"
uniform = /obj/item/clothing/under/pt/expeditionary
shoes = /obj/item/clothing/shoes/black
/decl/hierarchy/outfit/military/sifguard/utility
name = "SifGuard Uniform - Utility"
uniform = /obj/item/clothing/under/utility/expeditionary
shoes = /obj/item/clothing/shoes/boots/jackboots
/decl/hierarchy/outfit/military/sifguard/service
name = "SifGuard Uniform - Service"
uniform = /obj/item/clothing/under/utility/expeditionary
shoes = /obj/item/clothing/shoes/boots/jackboots
suit = /obj/item/clothing/suit/storage/service/expeditionary
/decl/hierarchy/outfit/military/sifguard/dress
name = "SifGuard Uniform - Dress"
uniform = /obj/item/clothing/under/mildress/expeditionary
shoes = /obj/item/clothing/shoes/dress
suit = /obj/item/clothing/suit/dress/expedition
gloves = /obj/item/clothing/gloves/white
head = /obj/item/clothing/head/dress/expedition
code/modules/mob/living/carbon/human/human.dm
+2 -4
View File
@@ -1518,11 +1518,9 @@
// Called by job_controller. Makes drones start with a permit, might be useful for other people later too.
/mob/living/carbon/human/equip_post_job() //Drone Permit moved to equip_survival_gear()
return
/* var/braintype = get_FBP_type()
var/braintype = get_FBP_type()
if(braintype == FBP_DRONE)
var/turf/T = get_turf(src)
var/obj/item/clothing/accessory/permit/drone/permit = new(T)
permit.set_name(real_name)
equip_to_appropriate_slot(permit) // If for some reason it can't find room, it'll still be on the floor.
*/
equip_to_appropriate_slot(permit) // If for some reason it can't find room, it'll still be on the floor.
code/modules/mob/living/carbon/human/species/species.dm
-7
View File
@@ -232,13 +232,6 @@
if (extendedtank) H.equip_to_slot_or_del(new boxtype(H.back), slot_in_backpack)
else H.equip_to_slot_or_del(new boxtype(H.back), slot_in_backpack)
var/braintype = H.get_FBP_type()
if(braintype == FBP_DRONE)
var/turf/T = get_turf(H)
var/obj/item/weapon/permit/drone/permit = new(T)
permit.set_name(H.real_name)
H.equip_to_slot_or_del(permit, slot_in_backpack)
/datum/species/proc/create_organs(var/mob/living/carbon/human/H) //Handles creation of mob organs.
H.mob_size = mob_size