shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modular_citadel

Browse Source
This commit is contained in:
LetterJay
2018-05-20 23:04:13 -05:00
parent a0b6b4e7d8
commit 1e207a7430
26 changed files with 282 additions and 848 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/storage/wallets.dm
+1 -95
View File
@@ -1,11 +1,10 @@
<<<<<<< HEAD
/obj/item/storage/wallet
name = "wallet"
desc = "It can hold a few small and personal things."
icon_state = "wallet"
w_class = WEIGHT_CLASS_SMALL
resistance_flags = FLAMMABLE
slot_flags = SLOT_ID
slot_flags = ITEM_SLOT_ID
var/obj/item/card/id/front_id = null
var/list/combined_access
@@ -90,96 +89,3 @@
if(item3_type)
new item3_type(src)
update_icon()
=======
/obj/item/storage/wallet
name = "wallet"
desc = "It can hold a few small and personal things."
icon_state = "wallet"
w_class = WEIGHT_CLASS_SMALL
resistance_flags = FLAMMABLE
slot_flags = ITEM_SLOT_ID
var/obj/item/card/id/front_id = null
var/list/combined_access
/obj/item/storage/wallet/ComponentInitialize()
. = ..()
GET_COMPONENT(STR, /datum/component/storage)
STR.max_items = 4
STR.can_hold = typecacheof(list(
/obj/item/stack/spacecash,
/obj/item/card,
/obj/item/clothing/mask/cigarette,
/obj/item/flashlight/pen,
/obj/item/seeds,
/obj/item/stack/medical,
/obj/item/toy/crayon,
/obj/item/coin,
/obj/item/dice,
/obj/item/disk,
/obj/item/implanter,
/obj/item/lighter,
/obj/item/lipstick,
/obj/item/match,
/obj/item/paper,
/obj/item/pen,
/obj/item/photo,
/obj/item/reagent_containers/dropper,
/obj/item/reagent_containers/syringe,
/obj/item/screwdriver,
/obj/item/stamp))
/obj/item/storage/wallet/Exited(atom/movable/AM)
. = ..()
refreshID()
/obj/item/storage/wallet/proc/refreshID()
if(!(front_id in src))
front_id = null
for(var/obj/item/card/id/I in contents)
LAZYINITLIST(combined_access)
LAZYCLEARLIST(combined_access)
if(!front_id)
front_id = I
combined_access |= I.access
update_icon()
/obj/item/storage/wallet/Entered(atom/movable/AM)
. = ..()
refreshID()
/obj/item/storage/wallet/update_icon()
var/new_state = "wallet"
if(front_id)
new_state = "wallet_[front_id.icon_state]"
if(new_state != icon_state) //avoid so many icon state changes.
icon_state = new_state
/obj/item/storage/wallet/GetID()
return front_id
/obj/item/storage/wallet/GetAccess()
if(LAZYLEN(combined_access))
return combined_access
else
return ..()
/obj/item/storage/wallet/random
icon_state = "random_wallet"
/obj/item/storage/wallet/random/PopulateContents()
var/item1_type = pick( /obj/item/stack/spacecash/c10, /obj/item/stack/spacecash/c100, /obj/item/stack/spacecash/c1000, /obj/item/stack/spacecash/c20, /obj/item/stack/spacecash/c200, /obj/item/stack/spacecash/c50, /obj/item/stack/spacecash/c500)
var/item2_type
if(prob(50))
item2_type = pick( /obj/item/stack/spacecash/c10, /obj/item/stack/spacecash/c100, /obj/item/stack/spacecash/c1000, /obj/item/stack/spacecash/c20, /obj/item/stack/spacecash/c200, /obj/item/stack/spacecash/c50, /obj/item/stack/spacecash/c500)
var/item3_type = pick( /obj/item/coin/silver, /obj/item/coin/silver, /obj/item/coin/gold, /obj/item/coin/iron, /obj/item/coin/iron, /obj/item/coin/iron )
spawn(2)
if(item1_type)
new item1_type(src)
if(item2_type)
new item2_type(src)
if(item3_type)
new item3_type(src)
update_icon()
>>>>>>> ecd0d8b... Merge pull request #37476 from AnturK/thisalwaysbuggedme
code/game/objects/items/tools/weldingtool.dm
-375
View File
@@ -1,377 +1,3 @@
<<<<<<< HEAD
#define WELDER_FUEL_BURN_INTERVAL 13
/obj/item/weldingtool
name = "welding tool"
desc = "A standard edition welder provided by Nanotrasen."
icon = 'icons/obj/tools.dmi'
icon_state = "welder"
item_state = "welder"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
flags_1 = CONDUCT_1
slot_flags = SLOT_BELT
force = 3
throwforce = 5
hitsound = "swing_hit"
usesound = list('sound/items/welder.ogg', 'sound/items/welder2.ogg')
var/acti_sound = 'sound/items/welderactivate.ogg'
var/deac_sound = 'sound/items/welderdeactivate.ogg'
throw_speed = 3
throw_range = 5
w_class = WEIGHT_CLASS_SMALL
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
resistance_flags = FIRE_PROOF
materials = list(MAT_METAL=70, MAT_GLASS=30)
var/welding = 0 //Whether or not the welding tool is off(0), on(1) or currently welding(2)
var/status = TRUE //Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower)
var/max_fuel = 20 //The max amount of fuel the welder can hold
var/change_icons = 1
var/can_off_process = 0
var/light_intensity = 2 //how powerful the emitted light is when used.
var/progress_flash_divisor = 10
var/burned_fuel_for = 0 //when fuel was last removed
heat = 3800
tool_behaviour = TOOL_WELDER
toolspeed = 1
/obj/item/weldingtool/Initialize()
. = ..()
create_reagents(max_fuel)
reagents.add_reagent("welding_fuel", max_fuel)
update_icon()
/obj/item/weldingtool/proc/update_torch()
if(welding)
add_overlay("[initial(icon_state)]-on")
item_state = "[initial(item_state)]1"
else
item_state = "[initial(item_state)]"
/obj/item/weldingtool/update_icon()
cut_overlays()
if(change_icons)
var/ratio = get_fuel() / max_fuel
ratio = CEILING(ratio*4, 1) * 25
add_overlay("[initial(icon_state)][ratio]")
update_torch()
return
/obj/item/weldingtool/process()
switch(welding)
if(0)
force = 3
damtype = "brute"
update_icon()
if(!can_off_process)
STOP_PROCESSING(SSobj, src)
return
//Welders left on now use up fuel, but lets not have them run out quite that fast
if(1)
force = 15
damtype = "fire"
++burned_fuel_for
if(burned_fuel_for >= WELDER_FUEL_BURN_INTERVAL)
use(1)
update_icon()
//This is to start fires. process() is only called if the welder is on.
open_flame()
/obj/item/weldingtool/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] welds [user.p_their()] every orifice closed! It looks like [user.p_theyre()] trying to commit suicide!</span>")
return (FIRELOSS)
/obj/item/weldingtool/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/screwdriver))
flamethrower_screwdriver(I, user)
else if(istype(I, /obj/item/stack/rods))
flamethrower_rods(I, user)
else
. = ..()
update_icon()
/obj/item/weldingtool/proc/explode()
var/turf/T = get_turf(loc)
var/plasmaAmount = reagents.get_reagent_amount("plasma")
dyn_explosion(T, plasmaAmount/5)//20 plasma in a standard welder has a 4 power explosion. no breaches, but enough to kill/dismember holder
qdel(src)
/obj/item/weldingtool/attack(mob/living/carbon/human/H, mob/user)
if(!istype(H))
return ..()
var/obj/item/bodypart/affecting = H.get_bodypart(check_zone(user.zone_selected))
if(affecting && affecting.status == BODYPART_ROBOTIC && user.a_intent != INTENT_HARM)
if(src.use_tool(H, user, 0, volume=50, amount=1))
if(user == H)
user.visible_message("<span class='notice'>[user] starts to fix some of the dents on [H]'s [affecting.name].</span>",
"<span class='notice'>You start fixing some of the dents on [H]'s [affecting.name].</span>")
if(!do_mob(user, H, 50))
return
item_heal_robotic(H, user, 15, 0)
else
return ..()
/obj/item/weldingtool/afterattack(atom/O, mob/user, proximity)
if(!proximity)
return
if(!status && O.is_refillable())
reagents.trans_to(O, reagents.total_volume)
to_chat(user, "<span class='notice'>You empty [src]'s fuel tank into [O].</span>")
update_icon()
if(isOn())
use(1)
var/turf/location = get_turf(user)
location.hotspot_expose(700, 50, 1)
if(get_fuel() <= 0)
set_light(0)
if(isliving(O))
var/mob/living/L = O
if(L.IgniteMob())
message_admins("[key_name_admin(user)] set [key_name_admin(L)] on fire")
log_game("[key_name(user)] set [key_name(L)] on fire")
/obj/item/weldingtool/attack_self(mob/user)
if(src.reagents.has_reagent("plasma"))
message_admins("[key_name_admin(user)] activated a rigged welder.")
explode()
switched_on(user)
if(welding)
set_light(light_intensity)
update_icon()
// Returns the amount of fuel in the welder
/obj/item/weldingtool/proc/get_fuel()
return reagents.get_reagent_amount("welding_fuel")
// Uses fuel from the welding tool.
/obj/item/weldingtool/use(used = 0)
if(!isOn() || !check_fuel())
return FALSE
if(used)
burned_fuel_for = 0
if(get_fuel() >= used)
reagents.remove_reagent("welding_fuel", used)
check_fuel()
return TRUE
else
return FALSE
//Turns off the welder if there is no more fuel (does this really need to be its own proc?)
/obj/item/weldingtool/proc/check_fuel(mob/user)
if(get_fuel() <= 0 && welding)
switched_on(user)
update_icon()
//mob icon update
if(ismob(loc))
var/mob/M = loc
M.update_inv_hands(0)
return 0
return 1
//Switches the welder on
/obj/item/weldingtool/proc/switched_on(mob/user)
if(!status)
to_chat(user, "<span class='warning'>[src] can't be turned on while unsecured!</span>")
return
welding = !welding
if(welding)
if(get_fuel() >= 1)
to_chat(user, "<span class='notice'>You switch [src] on.</span>")
playsound(loc, acti_sound, 50, 1)
force = 15
damtype = "fire"
hitsound = 'sound/items/welder.ogg'
update_icon()
START_PROCESSING(SSobj, src)
else
to_chat(user, "<span class='warning'>You need more fuel!</span>")
switched_off(user)
else
to_chat(user, "<span class='notice'>You switch [src] off.</span>")
playsound(loc, deac_sound, 50, 1)
switched_off(user)
//Switches the welder off
/obj/item/weldingtool/proc/switched_off(mob/user)
welding = 0
set_light(0)
force = 3
damtype = "brute"
hitsound = "swing_hit"
update_icon()
/obj/item/weldingtool/examine(mob/user)
..()
to_chat(user, "It contains [get_fuel()] unit\s of fuel out of [max_fuel].")
/obj/item/weldingtool/is_hot()
return welding * heat
//Returns whether or not the welding tool is currently on.
/obj/item/weldingtool/proc/isOn()
return welding
// When welding is about to start, run a normal tool_use_check, then flash a mob if it succeeds.
/obj/item/weldingtool/tool_start_check(mob/living/user, amount=0)
. = tool_use_check(user, amount)
if(. && user)
user.flash_act(light_intensity)
// Flash the user during welding progress
/obj/item/weldingtool/tool_check_callback(mob/living/user, amount, datum/callback/extra_checks)
. = ..()
if(. && user)
if (progress_flash_divisor == 0)
user.flash_act(min(light_intensity,1))
progress_flash_divisor = initial(progress_flash_divisor)
else
progress_flash_divisor--
// If welding tool ran out of fuel during a construction task, construction fails.
/obj/item/weldingtool/tool_use_check(mob/living/user, amount)
if(!isOn() || !check_fuel())
to_chat(user, "<span class='warning'>[src] has to be on to complete this task!</span>")
return FALSE
if(get_fuel() >= amount)
return TRUE
else
to_chat(user, "<span class='warning'>You need more welding fuel to complete this task!</span>")
return FALSE
/obj/item/weldingtool/proc/flamethrower_screwdriver(obj/item/I, mob/user)
if(welding)
to_chat(user, "<span class='warning'>Turn it off first!</span>")
return
status = !status
if(status)
to_chat(user, "<span class='notice'>You resecure [src] and close the fuel tank.</span>")
container_type = NONE
else
to_chat(user, "<span class='notice'>[src] can now be attached, modified, and refuelled.</span>")
container_type = OPENCONTAINER
add_fingerprint(user)
/obj/item/weldingtool/proc/flamethrower_rods(obj/item/I, mob/user)
if(!status)
var/obj/item/stack/rods/R = I
if (R.use(1))
var/obj/item/flamethrower/F = new /obj/item/flamethrower(user.loc)
if(!remove_item_from_storage(F))
user.transferItemToLoc(src, F, TRUE)
F.weldtool = src
add_fingerprint(user)
to_chat(user, "<span class='notice'>You add a rod to a welder, starting to build a flamethrower.</span>")
user.put_in_hands(F)
else
to_chat(user, "<span class='warning'>You need one rod to start building a flamethrower!</span>")
/obj/item/weldingtool/ignition_effect(atom/A, mob/user)
if(use_tool(A, user, 0, amount=1))
return "<span class='notice'>[user] casually lights [A] with [src], what a badass.</span>"
else
return ""
/obj/item/weldingtool/largetank
name = "industrial welding tool"
desc = "A slightly larger welder with a larger tank."
icon_state = "indwelder"
max_fuel = 40
materials = list(MAT_GLASS=60)
/obj/item/weldingtool/largetank/cyborg
name = "integrated welding tool"
desc = "An advanced welder designed to be used in robotic systems."
toolspeed = 0.5
/obj/item/weldingtool/largetank/flamethrower_screwdriver()
return
/obj/item/weldingtool/mini
name = "emergency welding tool"
desc = "A miniature welder used during emergencies."
icon_state = "miniwelder"
max_fuel = 10
w_class = WEIGHT_CLASS_TINY
materials = list(MAT_METAL=30, MAT_GLASS=10)
change_icons = 0
/obj/item/weldingtool/mini/flamethrower_screwdriver()
return
/obj/item/weldingtool/abductor
name = "alien welding tool"
desc = "An alien welding tool. Whatever fuel it uses, it never runs out."
icon = 'icons/obj/abductor.dmi'
icon_state = "welder"
toolspeed = 0.1
light_intensity = 0
change_icons = 0
/obj/item/weldingtool/abductor/process()
if(get_fuel() <= max_fuel)
reagents.add_reagent("welding_fuel", 1)
..()
/obj/item/weldingtool/hugetank
name = "upgraded industrial welding tool"
desc = "An upgraded welder based of the industrial welder."
icon_state = "upindwelder"
item_state = "upindwelder"
max_fuel = 80
materials = list(MAT_METAL=70, MAT_GLASS=120)
/obj/item/weldingtool/experimental
name = "experimental welding tool"
desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes."
icon_state = "exwelder"
item_state = "exwelder"
max_fuel = 40
materials = list(MAT_METAL=70, MAT_GLASS=120)
var/last_gen = 0
change_icons = 0
can_off_process = 1
light_intensity = 1
toolspeed = 0.5
var/nextrefueltick = 0
/obj/item/weldingtool/experimental/brass
name = "brass welding tool"
desc = "A brass welder that seems to constantly refuel itself. It is faintly warm to the touch."
resistance_flags = FIRE_PROOF | ACID_PROOF
icon_state = "brasswelder"
item_state = "brasswelder"
/obj/item/weldingtool/experimental/process()
..()
if(get_fuel() < max_fuel && nextrefueltick < world.time)
nextrefueltick = world.time + 10
reagents.add_reagent("welding_fuel", 1)
#undef WELDER_FUEL_BURN_INTERVAL
=======
#define WELDER_FUEL_BURN_INTERVAL 13
/obj/item/weldingtool
name = "welding tool"
@@ -744,4 +370,3 @@
reagents.add_reagent("welding_fuel", 1)
#undef WELDER_FUEL_BURN_INTERVAL
>>>>>>> ecd0d8b... Merge pull request #37476 from AnturK/thisalwaysbuggedme
code/modules/antagonists/highlander/highlander.dm
-8
View File
@@ -46,19 +46,11 @@
qdel(I)
for(var/obj/item/I in H.held_items)
qdel(I)
<<<<<<< HEAD
H.equip_to_slot_or_del(new /obj/item/clothing/under/kilt/highlander(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/radio/headset/heads/captain(H), slot_ears)
H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/highlander(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/pinpointer/nuke(H), slot_l_store)
=======
H.equip_to_slot_or_del(new /obj/item/clothing/under/kilt/highlander(H), SLOT_W_UNIFORM)
H.equip_to_slot_or_del(new /obj/item/radio/headset/heads/captain(H), SLOT_EARS)
H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/highlander(H), SLOT_HEAD)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), SLOT_SHOES)
H.equip_to_slot_or_del(new /obj/item/pinpointer/nuke(H), SLOT_L_STORE)
>>>>>>> ecd0d8b... Merge pull request #37476 from AnturK/thisalwaysbuggedme
for(var/obj/item/pinpointer/nuke/P in H)
P.attack_self(H)
var/obj/item/card/id/W = new(H)
code/modules/clothing/ears/_ears.dm
+45 -94
View File
@@ -1,95 +1,46 @@
<<<<<<< HEAD
//Ears: currently only used for headsets and earmuffs
/obj/item/clothing/ears
name = "ears"
w_class = WEIGHT_CLASS_TINY
throwforce = 0
slot_flags = SLOT_EARS
resistance_flags = NONE
/obj/item/clothing/ears/earmuffs
name = "earmuffs"
desc = "Protects your hearing from loud noises, and quiet ones as well."
icon_state = "earmuffs"
item_state = "earmuffs"
strip_delay = 15
equip_delay_other = 25
resistance_flags = FLAMMABLE
flags_2 = BANG_PROTECT_2|HEALS_EARS_2
/obj/item/clothing/ears/headphones
name = "headphones"
desc = "Unce unce unce unce. Boop!"
icon = 'icons/obj/clothing/accessories.dmi'
icon_state = "headphones"
item_state = "headphones"
slot_flags = SLOT_EARS | SLOT_HEAD | SLOT_NECK //Fluff item, put it whereever you want!
actions_types = list(/datum/action/item_action/toggle_headphones)
var/headphones_on = FALSE
/obj/item/clothing/ears/headphones/Initialize()
. = ..()
update_icon()
/obj/item/clothing/ears/headphones/update_icon()
icon_state = "[initial(icon_state)]_[headphones_on? "on" : "off"]"
item_state = "[initial(item_state)]_[headphones_on? "on" : "off"]"
/obj/item/clothing/ears/headphones/proc/toggle(owner)
headphones_on = !headphones_on
update_icon()
var/mob/living/carbon/human/H = owner
if(istype(H))
H.update_inv_ears()
H.update_inv_neck()
H.update_inv_head()
to_chat(owner, "<span class='notice'>You turn the music [headphones_on? "on. Untz Untz Untz!" : "off."]</span>")
=======
//Ears: currently only used for headsets and earmuffs
/obj/item/clothing/ears
name = "ears"
w_class = WEIGHT_CLASS_TINY
throwforce = 0
slot_flags = ITEM_SLOT_EARS
resistance_flags = NONE
/obj/item/clothing/ears/earmuffs
name = "earmuffs"
desc = "Protects your hearing from loud noises, and quiet ones as well."
icon_state = "earmuffs"
item_state = "earmuffs"
strip_delay = 15
equip_delay_other = 25
resistance_flags = FLAMMABLE
flags_2 = BANG_PROTECT_2|HEALS_EARS_2
/obj/item/clothing/ears/headphones
name = "headphones"
desc = "Unce unce unce unce. Boop!"
icon = 'icons/obj/clothing/accessories.dmi'
icon_state = "headphones"
item_state = "headphones"
slot_flags = ITEM_SLOT_EARS | ITEM_SLOT_HEAD | ITEM_SLOT_NECK //Fluff item, put it whereever you want!
actions_types = list(/datum/action/item_action/toggle_headphones)
var/headphones_on = FALSE
/obj/item/clothing/ears/headphones/Initialize()
. = ..()
update_icon()
/obj/item/clothing/ears/headphones/update_icon()
icon_state = "[initial(icon_state)]_[headphones_on? "on" : "off"]"
item_state = "[initial(item_state)]_[headphones_on? "on" : "off"]"
/obj/item/clothing/ears/headphones/proc/toggle(owner)
headphones_on = !headphones_on
update_icon()
var/mob/living/carbon/human/H = owner
if(istype(H))
H.update_inv_ears()
H.update_inv_neck()
H.update_inv_head()
to_chat(owner, "<span class='notice'>You turn the music [headphones_on? "on. Untz Untz Untz!" : "off."]</span>")
>>>>>>> ecd0d8b... Merge pull request #37476 from AnturK/thisalwaysbuggedme
/obj/item/clothing/ears
name = "ears"
w_class = WEIGHT_CLASS_TINY
throwforce = 0
slot_flags = ITEM_SLOT_EARS
resistance_flags = NONE
/obj/item/clothing/ears/earmuffs
name = "earmuffs"
desc = "Protects your hearing from loud noises, and quiet ones as well."
icon_state = "earmuffs"
item_state = "earmuffs"
strip_delay = 15
equip_delay_other = 25
resistance_flags = FLAMMABLE
flags_2 = BANG_PROTECT_2|HEALS_EARS_2
/obj/item/clothing/ears/headphones
name = "headphones"
desc = "Unce unce unce unce. Boop!"
icon = 'icons/obj/clothing/accessories.dmi'
icon_state = "headphones"
item_state = "headphones"
code/modules/mob/living/carbon/monkey/inventory.dm
+9 -49
View File
@@ -1,71 +1,31 @@
<<<<<<< HEAD
/mob/living/carbon/monkey/can_equip(obj/item/I, slot, disable_warning = 0)
switch(slot)
if(slot_hands)
if(SLOT_HANDS)
if(get_empty_held_indexes())
return TRUE
return FALSE
if(slot_wear_mask)
if(SLOT_WEAR_MASK)
if(wear_mask)
return FALSE
if( !(I.slot_flags & SLOT_MASK) )
if( !(I.slot_flags & ITEM_SLOT_MASK) )
return FALSE
return TRUE
if(slot_neck)
if(SLOT_NECK)
if(wear_neck)
return FALSE
if( !(I.slot_flags & SLOT_NECK) )
if( !(I.slot_flags & ITEM_SLOT_NECK) )
return FALSE
return TRUE
if(slot_head)
if(SLOT_HEAD)
if(head)
return FALSE
if( !(I.slot_flags & SLOT_HEAD) )
if( !(I.slot_flags & ITEM_SLOT_HEAD) )
return FALSE
return TRUE
if(slot_back)
if(SLOT_BACK)
if(back)
return FALSE
if( !(I.slot_flags & SLOT_BACK) )
if( !(I.slot_flags & ITEM_SLOT_BACK) )
return FALSE
return TRUE
return FALSE //Unsupported slot
=======
/mob/living/carbon/monkey/can_equip(obj/item/I, slot, disable_warning = 0)
switch(slot)
if(SLOT_HANDS)
if(get_empty_held_indexes())
return TRUE
return FALSE
if(SLOT_WEAR_MASK)
if(wear_mask)
return FALSE
if( !(I.slot_flags & ITEM_SLOT_MASK) )
return FALSE
return TRUE
if(SLOT_NECK)
if(wear_neck)
return FALSE
if( !(I.slot_flags & ITEM_SLOT_NECK) )
return FALSE
return TRUE
if(SLOT_HEAD)
if(head)
return FALSE
if( !(I.slot_flags & ITEM_SLOT_HEAD) )
return FALSE
return TRUE
if(SLOT_BACK)
if(back)
return FALSE
if( !(I.slot_flags & ITEM_SLOT_BACK) )
return FALSE
return TRUE
return FALSE //Unsupported slot
>>>>>>> ecd0d8b... Merge pull request #37476 from AnturK/thisalwaysbuggedme
modular_citadel/code/__HELPERS/mobs.dm
+13 -13
View File
@@ -1,28 +1,28 @@
/proc/slot_to_string(slot)
switch(slot)
if(slot_back)
if(SLOT_BACK)
return "Backpack"
if(slot_wear_mask)
if(SLOT_WEAR_MASK)
return "Mask"
if(slot_hands)
if(SLOT_HANDS)
return "Hands"
if(slot_belt)
if(SLOT_BELT)
return "Belt"
if(slot_ears)
if(SLOT_EARS)
return "Ears"
if(slot_glasses)
if(SLOT_GLASSES)
return "Glasses"
if(slot_gloves)
if(SLOT_GLOVES)
return "Gloves"
if(slot_neck)
if(SLOT_NECK)
return "Neck"
if(slot_head)
if(SLOT_HEAD)
return "Head"
if(slot_shoes)
if(SLOT_SHOES)
return "Shoes"
if(slot_wear_suit)
if(SLOT_WEAR_SUIT)
return "Suit"
if(slot_w_uniform)
if(SLOT_W_UNIFORM)
return "Uniform"
if(slot_in_backpack)
if(SLOT_IN_BACKPACK)
return "In backpack"
modular_citadel/code/controllers/subsystem/job.dm
+3 -3
View File
@@ -15,15 +15,15 @@
permitted = FALSE
if(G.ckeywhitelist && G.ckeywhitelist.len && !(the_mob.client.ckey in G.ckeywhitelist))
permitted = FALSE
if(!equipbackpackstuff && G.category == slot_in_backpack)//snowflake check since plopping stuff in the backpack doesnt work for pre-job equip loadout stuffs
if(!equipbackpackstuff && G.category == SLOT_IN_BACKPACK)//snowflake check since plopping stuff in the backpack doesnt work for pre-job equip loadout stuffs
permitted = FALSE
if(equipbackpackstuff && G.category != slot_in_backpack)//ditto
if(equipbackpackstuff && G.category != SLOT_IN_BACKPACK)//ditto
permitted = FALSE
if(!permitted)
continue
var/obj/item/I = new G.path
if(!M.equip_to_slot_if_possible(I, G.category, disable_warning = TRUE, bypass_equip_delay_self = TRUE)) // If the job's dresscode compliant, try to put it in its slot, first
if(!M.equip_to_slot_if_possible(I, slot_in_backpack, disable_warning = TRUE, bypass_equip_delay_self = TRUE)) // Otherwise, try to put it in the backpack
if(!M.equip_to_slot_if_possible(I, SLOT_IN_BACKPACK, disable_warning = TRUE, bypass_equip_delay_self = TRUE)) // Otherwise, try to put it in the backpack
I.forceMove(get_turf(M)) // If everything fails, just put it on the floor under the mob.
/datum/controller/subsystem/job/proc/FreeRole(rank)
modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm
+1 -1
View File
@@ -24,7 +24,7 @@
/obj/item/electropack/shockcollar/attack_hand(mob/user)
if(loc == user)
if(slot_flags == SLOT_NECK)
if(user.get_item_by_slot(slot_neck))
if(user.get_item_by_slot(SLOT_NECK))
to_chat(user, "<span class='warning'>The collar is fastened tight! You'll need help taking this off!</span>")
return
..()
modular_citadel/code/modules/client/loadout/__donator.dm
+47 -47
View File
@@ -2,279 +2,279 @@
/datum/gear/pingcoderfailsafe
name = "IF YOU SEE THIS, PING A CODER RIGHT NOW!"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/bikehorn/golden
ckeywhitelist = list("This entry should never appear with this variable set.") //If it does, then that means somebody fucked up the whitelist system pretty hard
/datum/gear/donortestingbikehorn
name = "Donor item testing bikehorn"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/bikehorn
geargroupID = "DONORTEST"
/datum/gear/kevhorn
name = "Airhorn"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/bikehorn/airhorn
ckeywhitelist = list("kevinz000")
/datum/gear/cebusoap
name = "Cebutris' soap"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/custom/ceb_soap
ckeywhitelist = list("cebutris")
/datum/gear/kiaracloak
name = "Kiara's cloak"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/cloak/inferno
ckeywhitelist = list("inferno707")
/datum/gear/kiaracollar
name = "Kiara's collar"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/petcollar/inferno
ckeywhitelist = list("inferno707")
/datum/gear/kiaramedal
name = "Insignia of Steele"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/clothing/accessory/medal/steele
ckeywhitelist = list("inferno707")
/datum/gear/sexymimemask
name = "The hollow heart"
category = slot_wear_mask
category = SLOT_WEAR_MASK
path = /obj/item/clothing/mask/sexymime
ckeywhitelist = list("inferno707")
/datum/gear/engravedzippo
name = "Engraved zippo"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/lighter/gold
ckeywhitelist = list("dirtyoldharry")
/datum/gear/geisha
name = "Geisha suit"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/geisha
ckeywhitelist = list("atiefling")
/datum/gear/specialscarf
name = "Special scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/scarf/zomb
ckeywhitelist = list("zombierobin")
/datum/gear/redmadcoat
name = "The Mad's labcoat"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/toggle/labcoat/mad/red
ckeywhitelist = list("zombierobin")
/datum/gear/santahat
name = "Santa hat"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/santa/fluff
ckeywhitelist = list("illotafv")
/datum/gear/reindeerhat
name = "Reindeer hat"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/hardhat/reindeer/fluff
ckeywhitelist = list("illotafv")
/datum/gear/treeplushie
name = "Christmas tree plushie"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/plush/tree
ckeywhitelist = list("illotafv")
/datum/gear/santaoutfit
name = "Santa costume"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/space/santa/fluff
ckeywhitelist = list("illotafv")
/datum/gear/treecloak
name = "Christmas tree cloak"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/cloak/festive
ckeywhitelist = list("illotafv")
/datum/gear/carrotplush
name = "Carrot plushie"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/plush/carrot
ckeywhitelist = list("improvedname")
/datum/gear/carrotcloak
name = "Carrot cloak"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/cloak/carrot
ckeywhitelist = list("improvedname")
/datum/gear/albortorosamask
name = "Alborto Rosa mask"
category = slot_wear_mask
category = SLOT_WEAR_MASK
path = /obj/item/clothing/mask/luchador/zigfie
ckeywhitelist = list("zigfie")
/datum/gear/mankini
name = "Mankini"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/mankini
ckeywhitelist = list("zigfie")
/datum/gear/pinkshoes
name = "Pink shoes"
category = slot_shoes
category = SLOT_SHOES
path = /obj/item/clothing/shoes/sneakers/pink
ckeywhitelist = list("zigfie")
/datum/gear/reecesgreatcoat
name = "Reece's Great Coat"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/trenchcoat/green
ckeywhitelist = list("geemiesif")
/datum/gear/russianflask
name = "Russian flask"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/reagent_containers/food/drinks/flask/russian
cost = 2
ckeywhitelist = list("slomka")
/datum/gear/stalkermask
name = "S.T.A.L.K.E.R. mask"
category = slot_wear_mask
category = SLOT_WEAR_MASK
path = /obj/item/clothing/mask/gas/stalker
ckeywhitelist = list("slomka")
/datum/gear/stripedcollar
name = "Striped collar"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/petcollar/stripe
ckeywhitelist = list("jademanique")
/datum/gear/performersoutfit
name = "Bluish performer's outfit"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/singery/custom
ckeywhitelist = list("killer402402")
/datum/gear/vermillion
name = "Vermillion clothing"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/suit/vermillion
ckeywhitelist = list("fractious")
/datum/gear/AM4B
name = "Foam Force AM4-B"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/gun/ballistic/automatic/AM4B
ckeywhitelist = list("zeronetalpha")
/datum/gear/carrotsatchel
name = "Carrot Satchel"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/storage/backpack/satchel/carrot
ckeywhitelist = list("improvedname")
/datum/gear/naomisweater
name = "worn black sweater"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/bb_sweater/black/naomi
ckeywhitelist = list("technicalmagi")
/datum/gear/naomicollar
name = "worn pet collar"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/petcollar/naomi
ckeywhitelist = list("technicalmagi")
/datum/gear/gladiator
name = "Gladiator Armor"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/under/gladiator
ckeywhitelist = list("aroche")
/datum/gear/bloodredtie
name = "Blood Red Tie"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/tie/bloodred
ckeywhitelist = list("kyutness")
/datum/gear/puffydress
name = "Puffy Dress"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/puffydress
ckeywhitelist = list("stallingratt")
/datum/gear/labredblack
name = "Black and Red Coat"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/toggle/labcoat/labredblack
ckeywhitelist = list("blakeryan", "durandalphor")
/datum/gear/torisword
name = "Rainbow Zweihander"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/twohanded/hypereutactic/toy/rainbow
ckeywhitelist = list("annoymous35")
/datum/gear/darksabre
name = "Dark Sabre"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/sword/darksabre
ckeywhitelist = list("inferno707")
datum/gear/darksabresheath
name = "Dark Sabre Sheath"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/storage/belt/sabre/darksabre
ckeywhitelist = list("inferno707")
/datum/gear/toriball
name = "Rainbow Tennis Ball"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/tennis/rainbow
ckeywhitelist = list("annoymous35")
/datum/gear/izzyball
name = "Katlin's Ball"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/tennis/rainbow/izzy
ckeywhitelist = list("izzyinbox")
/datum/gear/cloak
name = "Green Cloak"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/cloak/green
ckeywhitelist = list("killer402402")
/datum/gear/steelflask
name = "Steel Flask"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/reagent_containers/food/drinks/flask/steel
cost = 2
ckeywhitelist = list("johnnyvitrano")
/datum/gear/paperhat
name = "Paper Hat"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/paperhat
ckeywhitelist = list("kered2")
/datum/gear/cloakce
name = "Polychromic CE Cloak"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/clothing/neck/cloak/polychromic/polyce
ckeywhitelist = list("worksbythesea", "blakeryan")
/datum/gear/ssk
name = "Stun Sword Kit"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/ssword_kit
ckeywhitelist = list("phillip458")
modular_citadel/code/modules/client/loadout/_medical.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/datum/gear/stethoscope
name = "Stethoscope"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/stethoscope
restricted_roles = list("Medical Doctor", "Chief Medical Officer")
modular_citadel/code/modules/client/loadout/_security.dm
+12 -12
View File
@@ -1,71 +1,71 @@
/datum/gear/navyblueuniformhos
name = "Head of Security navyblue uniform"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/head_of_security/navyblue
restricted_roles = list("Head of Security")
/datum/gear/navybluehosberet
name = "Head of security's Naviblue beret"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/beret/sec/navyhos
restricted_roles = list("Head of Security")
/datum/gear/navybluejackethos
name = "head of security's navyblue jacket"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/security/hos
restricted_roles = list("Head of Security")
/datum/gear/navybluejacketofficer
name = "security officer's navyblue jacket"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/security/officer
restricted_roles = list("Security Officer")
/datum/gear/navyblueofficerberet
name = "Security officer's Navyblue beret"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/beret/sec/navyofficer
restricted_roles = list("Security Officer")
/datum/gear/navyblueuniformofficer
name = "security officer navyblue uniform"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/security/navyblue
restricted_roles = list("Security officer")
/datum/gear/navybluejacketwarden
name = "warden navyblue jacket"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/security/warden
restricted_roles = list("Warden")
/datum/gear/navybluewardenberet
name = "Warden's navyblue beret"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/beret/sec/navywarden
restricted_roles = list("Warden")
/datum/gear/navyblueuniformwarden
name = "Warden navyblue uniform"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/warden/navyblue
restricted_roles = list("Warden")
/datum/gear/secskirt
name = "Security skirt"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/security/skirt
restricted_roles = list("Security Officer", "Warden", "Head of Security")
/datum/gear/hosskirt
name = "Head of security's skirt"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/head_of_security/skirt
restricted_roles = list("Head of Security")
/datum/gear/sechud
name = "Security Hud"
category = slot_glasses
category = SLOT_GLASSES
path = /obj/item/clothing/glasses/hud/security
restricted_roles = list("Security Officer", "Warden", "Head of Security")
modular_citadel/code/modules/client/loadout/_service.dm
+2 -2
View File
@@ -1,13 +1,13 @@
/datum/gear/plushvar
name = "Ratvar Plushie"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/plush/plushvar
cost = 5
restricted_roles = list("Chaplain")
/datum/gear/narplush
name = "Narsie Plushie"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/plush/narplush
cost = 5
restricted_roles = list("Chaplain")
modular_citadel/code/modules/client/loadout/backpack.dm
+12 -12
View File
@@ -1,59 +1,59 @@
/datum/gear/plushcarp
name = "Space carp plushie"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/plush/carpplushie
/datum/gear/plushliz
name = "Lizard plushie"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/plush/lizardplushie
/datum/gear/plushsnek
name = "Snake plushie"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/plush/snakeplushie
/datum/gear/plushslime
name = "Slime plushie"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/plush/slimeplushie
/datum/gear/tennis
name = "Classic Tennis Ball"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/tennis
/datum/gear/tennisred
name = "Red Tennis Ball"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/tennis/red
/datum/gear/tennisyellow
name = "Yellow Tennis Ball"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/tennis/yellow
/datum/gear/tennisgreen
name = "Green Tennis Ball"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/tennis/green
/datum/gear/tenniscyan
name = "Cyan Tennis Ball"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/tennis/cyan
/datum/gear/tennisblue
name = "Blue Tennis Ball"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/tennis/blue
/datum/gear/tennispurple
name = "Purple Tennis Ball"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/toy/tennis/purple
/datum/gear/dildo
name = "Customizable dildo"
category = slot_in_backpack
category = SLOT_IN_BACKPACK
path = /obj/item/dildo/custom
modular_citadel/code/modules/client/loadout/glasses.dm
+9 -9
View File
@@ -1,44 +1,44 @@
/datum/gear/cold
name = "Cold goggles"
category = slot_glasses
category = SLOT_GLASSES
path = /obj/item/clothing/glasses/cold
/datum/gear/eyepatch
name = "Eyepatch"
category = slot_glasses
category = SLOT_GLASSES
path = /obj/item/clothing/glasses/eyepatch
/datum/gear/heat
name = "Heat goggles"
category = slot_glasses
category = SLOT_GLASSES
path = /obj/item/clothing/glasses/heat
/datum/gear/hipster
name = "Hipster glasses"
category = slot_glasses
category = SLOT_GLASSES
path = /obj/item/clothing/glasses/regular/hipster
/datum/gear/jamjar
name = "Jamjar glasses"
category = slot_glasses
category = SLOT_GLASSES
path = /obj/item/clothing/glasses/regular/jamjar
/datum/gear/monocle
name = "Monocle"
category = slot_glasses
category = SLOT_GLASSES
path = /obj/item/clothing/glasses/monocle
/datum/gear/orange
name = "Orange glasses"
category = slot_glasses
category = SLOT_GLASSES
path = /obj/item/clothing/glasses/orange
/datum/gear/red
name = "Red Glasses"
category = slot_glasses
category = SLOT_GLASSES
path = /obj/item/clothing/glasses/red
/datum/gear/prescription
name = "Prescription glasses"
category = slot_glasses
category = SLOT_GLASSES
path = /obj/item/clothing/glasses/regular
modular_citadel/code/modules/client/loadout/gloves.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/datum/gear/fingerless
name = "Fingerless Gloves"
category = slot_gloves
category = SLOT_GLOVES
path = /obj/item/clothing/gloves/fingerless
modular_citadel/code/modules/client/loadout/hands.dm
+13 -13
View File
@@ -1,67 +1,67 @@
/datum/gear/cane
name = "Cane"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/cane
/datum/gear/cigarettes
name = "Cigarette pack"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/storage/fancy/cigarettes
/datum/gear/dice
name = "Dice bag"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/storage/pill_bottle/dice
/datum/gear/eightball
name = "Magic eightball"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/toy/eightball
/datum/gear/matches
name = "Matchbox"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/storage/box/matches
/datum/gear/cheaplighter
name = "Cheap lighter"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/lighter/greyscale
/datum/gear/cards
name = "Playing cards"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/toy/cards/deck
/datum/gear/skub
name = "Skub"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/skub
/datum/gear/carpplushie
name = "Space carp plushie"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/toy/plush/carpplushie
/datum/gear/wallet
name = "Wallet"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/storage/wallet
/datum/gear/flask
name = "Flask"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/reagent_containers/food/drinks/flask
cost = 2
/datum/gear/zippolighter
name = "Zippo Lighter"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/lighter
cost = 2
/datum/gear/cigar
name = "Cigar"
category = slot_hands
category = SLOT_HANDS
path = /obj/item/clothing/mask/cigarette/cigar
cost = 4 //smoking is bad mkay
modular_citadel/code/modules/client/loadout/head.dm
+14 -14
View File
@@ -1,74 +1,74 @@
/datum/gear/baseball
name = "Ballcap"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/soft/mime
/datum/gear/beanie
name = "Beanie"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/beanie
/datum/gear/beret
name = "Black beret"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/beret/black
/datum/gear/flatcap
name = "Flat cap"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/flatcap
/datum/gear/pirate
name = "Pirate hat"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/pirate
/datum/gear/rice_hat
name = "Rice hat"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/rice_hat
/datum/gear/ushanka
name = "Ushanka"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/ushanka
/datum/gear/slime
name = "Slime hat"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/collectable/slime
/datum/gear/fedora
name = "Fedora"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/fedora
/datum/gear/that
name = "Top Hat"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/that
//trek fancy Hats!
/datum/gear/trekcap
name = "Federation Officer's Cap"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/caphat/formal/fedcover
restricted_roles = list("Captain","Head of Personnel")
/datum/gear/trekcapmedisci
name = "Federation Officer's Cap"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/caphat/formal/fedcover/medsci
restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
/datum/gear/trekcapeng
name = "Federation Officer's Cap"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/caphat/formal/fedcover/eng
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
/datum/gear/trekcapsec
name = "Federation Officer's Cap"
category = slot_head
category = SLOT_HEAD
path = /obj/item/clothing/head/caphat/formal/fedcover/sec
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
modular_citadel/code/modules/client/loadout/mask.dm
+3 -3
View File
@@ -1,9 +1,9 @@
/datum/gear/balaclava
name = "Balaclava"
category = slot_wear_mask
category = SLOT_WEAR_MASK
path = /obj/item/clothing/mask/balaclava
/datum/gear/moustache
name = "Fake moustache"
category = slot_wear_mask
category = SLOT_WEAR_MASK
path = /obj/item/clothing/mask/fakemoustache
modular_citadel/code/modules/client/loadout/neck.dm
+17 -17
View File
@@ -1,84 +1,84 @@
/datum/gear/bluetie
name = "Blue tie"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/tie/blue
/datum/gear/redtie
name = "Red tie"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/tie/red
/datum/gear/blacktie
name = "Black tie"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/tie/black
/datum/gear/collar
name = "Collar"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/petcollar
/datum/gear/scarf
name = "White scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/scarf
/datum/gear/blackscarf
name = "Black scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/scarf/black
/datum/gear/redscarf
name = "Red scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/scarf/red
/datum/gear/greenscarf
name = "Green scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/scarf/green
/datum/gear/darkbluescarf
name = "Dark blue scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/scarf/darkblue
/datum/gear/purplescarf
name = "Purple scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/scarf/purple
/datum/gear/yellowscarf
name = "Yellow scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/scarf/yellow
/datum/gear/orangescarf
name = "Orange scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/scarf/orange
/datum/gear/cyanscarf
name = "Cyan scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/scarf/cyan
/datum/gear/stripedredscarf
name = "Striped red scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/stripedredscarf
/datum/gear/stripedbluescarf
name = "Striped blue scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/stripedbluescarf
/datum/gear/stripedgreenscarf
name = "Striped green scarf"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/neck/stripedgreenscarf
/datum/gear/headphones
name = "Headphones"
category = slot_neck
category = SLOT_NECK
path = /obj/item/clothing/ears/headphones
modular_citadel/code/modules/client/loadout/shoes.dm
+8 -8
View File
@@ -1,39 +1,39 @@
/datum/gear/laceup
name = "Laceup shoes"
category = slot_shoes
category = SLOT_SHOES
path = /obj/item/clothing/shoes/laceup
/datum/gear/workboots
name = "Work boots"
category = slot_shoes
category = SLOT_SHOES
path = /obj/item/clothing/shoes/workboots
/datum/gear/jackboots
name = "Jackboots"
category = slot_shoes
category = SLOT_SHOES
path = /obj/item/clothing/shoes/jackboots
/datum/gear/winterboots
name = "Winter boots"
category = slot_shoes
category = SLOT_SHOES
path = /obj/item/clothing/shoes/winterboots
/datum/gear/sandals
name = "Sandals"
category = slot_shoes
category = SLOT_SHOES
path = /obj/item/clothing/shoes/sandal
/datum/gear/blackshoes
name = "Black shoes"
category = slot_shoes
category = SLOT_SHOES
path = /obj/item/clothing/shoes/sneakers/black
/datum/gear/brownshoes
name = "Brown shoes"
category = slot_shoes
category = SLOT_SHOES
path = /obj/item/clothing/shoes/sneakers/brown
/datum/gear/whiteshoes
name = "White shoes"
category = slot_shoes
category = SLOT_SHOES
path = /obj/item/clothing/shoes/sneakers/white
modular_citadel/code/modules/client/loadout/suit.dm
+20 -20
View File
@@ -1,82 +1,82 @@
/datum/gear/poncho
name = "Poncho"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/poncho
/datum/gear/ponchogreen
name = "Green poncho"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/poncho/green
/datum/gear/ponchored
name = "Red poncho"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/poncho/red
/datum/gear/redhood
name = "Red cloak"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/hooded/cloak/david
cost = 3
/datum/gear/jacketbomber
name = "Bomber jacket"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/jacket
/datum/gear/jacketleather
name = "Leather jacket"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/jacket/leather
/datum/gear/overcoatleather
name = "Leather overcoat"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/jacket/leather/overcoat
/datum/gear/jacketpuffer
name = "Puffer jacket"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/jacket/puffer
/datum/gear/vestpuffer
name = "Puffer vest"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/jacket/puffer/vest
/datum/gear/jacketlettermanbrown
name = "Brown letterman jacket"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/jacket/letterman
/datum/gear/jacketlettermanred
name = "Red letterman jacket"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/jacket/letterman_red
/datum/gear/jacketlettermanNT
name = "Nanotrasen letterman jacket"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/jacket/letterman_nanotrasen
/datum/gear/coat
name = "Winter coat"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/hooded/wintercoat
/datum/gear/militaryjacket
name = "Military Jacket"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/jacket/miljacket
/datum/gear/ianshirt
name = "Ian Shirt"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/ianshirt
/datum/gear/trekds9_coat
name = "DS9 Overcoat (use uniform)"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/storage/trek/ds9
restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster",
"Medical Doctor","Chemist","Virologist","Geneticist","Scientist", "Roboticist",
@@ -85,24 +85,24 @@
//Federation jackets from movies
/datum/gear/trekcmdcap
name = "fed (movie) uniform, Captain"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/storage/fluff/fedcoat/capt
restricted_roles = list("Captain","Head of Personnel")
/datum/gear/trekcmdmov
name = "fed (movie) uniform, sec"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/storage/fluff/fedcoat
restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster","Warden","Detective","Security Officer")
/datum/gear/trekmedscimov
name = "fed (movie) uniform, med/sci"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/storage/fluff/fedcoat/medsci
restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
/datum/gear/trekengmov
name = "fed (movie) uniform, ops/eng"
category = slot_wear_suit
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/storage/fluff/fedcoat/eng
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Cargo Technician", "Shaft Miner", "Quartermaster")
modular_citadel/code/modules/client/loadout/uniform.dm
+43 -43
View File
@@ -1,143 +1,143 @@
/datum/gear/suitblack
name = "Black suit"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/suit_jacket
/datum/gear/suitgreen
name = "Green suit"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/suit_jacket/green
/datum/gear/suitred
name = "Red suit"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/suit_jacket/red
/datum/gear/suitcharcoal
name = "Charcoal suit"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/suit_jacket/charcoal
/datum/gear/suitnavy
name = "Navy suit"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/suit_jacket/navy
/datum/gear/suitburgundy
name = "Burgundy suit"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/suit_jacket/burgundy
/datum/gear/suittan
name = "Tan suit"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/suit_jacket/tan
/datum/gear/suitwhite
name = "White suit"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/suit_jacket/white
/datum/gear/assistantformal
name = "Assistant's formal uniform"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/assistantformal
/datum/gear/maidcostume
name = "Maid costume"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/maid
/datum/gear/mailmanuniform
name = "Mailman's jumpsuit"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/mailman
/datum/gear/skirtblack
name = "Black skirt"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/skirt/black
/datum/gear/skirtblue
name = "Blue skirt"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/skirt/blue
/datum/gear/skirtred
name = "Red skirt"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/skirt/red
/datum/gear/skirtpurple
name = "Purple skirt"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/skirt/purple
/datum/gear/kilt
name = "Kilt"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/kilt
/datum/gear/camoshorts
name = "Camo Pants"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/pants/camo
/datum/gear/bjeans
name = "Black Jeans"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/pants/blackjeans
/datum/gear/cjeans
name = "Classic Jeans"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/pants/classicjeans
/datum/gear/khaki
name = "Khaki Pants"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/pants/khaki
/datum/gear/wpants
name = "White Pants"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/pants/white
/datum/gear/rpants
name = "Red Pants"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/pants/red
/datum/gear/tpants
name = "Tan Pants"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/pants/tan
/datum/gear/trpants
name = "Track Pants"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/pants/track
/datum/gear/turtleneck
name = "Tactitool Turtleneck"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/syndicate/cosmetic
/datum/gear/polykilt
name = "Polychromic Kilt"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/polychromic/kilt
cost = 3
/datum/gear/polyshorts
name = "Polychromic Shorts"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/polychromic/shorts
cost = 3
/datum/gear/polyshortpants
name = "Polychromic Athletic Shorts"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/polychromic/shortpants
cost = 2
@@ -145,94 +145,94 @@
//TOS
/datum/gear/trekcmdtos
name = "TOS uniform, cmd"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/trek/command
restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
/datum/gear/trekmedscitos
name = "TOS uniform, med/sci"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/trek/medsci
restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
/datum/gear/trekengtos
name = "TOS uniform, ops/sec"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/trek/engsec
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
//TNG
/datum/gear/trekcmdtng
name = "TNG uniform, cmd"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/trek/command/next
restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
/datum/gear/trekmedscitng
name = "TNG uniform, med/sci"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/trek/medsci/next
restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
/datum/gear/trekengtng
name = "TNG uniform, ops/sec"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/trek/engsec/next
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
//VOY
/datum/gear/trekcmdvoy
name = "VOY uniform, cmd"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/trek/command/voy
restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
/datum/gear/trekmedscivoy
name = "VOY uniform, med/sci"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/trek/medsci/voy
restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
/datum/gear/trekengvoy
name = "VOY uniform, ops/sec"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/trek/engsec/voy
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
//DS9
/datum/gear/trekcmdds9
name = "DS9 uniform, cmd"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/trek/command/ds9
restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
/datum/gear/trekmedscids9
name = "DS9 uniform, med/sci"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/trek/medsci/ds9
restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
/datum/gear/trekengds9
name = "DS9 uniform, ops/sec"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/trek/engsec/ds9
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
//ENT
/datum/gear/trekcmdent
name = "ENT uniform, cmd"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/trek/command/ent
restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
/datum/gear/trekmedscient
name = "ENT uniform, med/sci"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/trek/medsci/ent
restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
/datum/gear/trekengent
name = "ENT uniform, ops/sec"
category = slot_w_uniform
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/rank/trek/engsec/ent
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
modular_citadel/code/modules/client/preferences.dm
+4 -4
View File
@@ -664,11 +664,11 @@
var/occupied_slots = L[slot_to_string(initial(G.category))] ? L[slot_to_string(initial(G.category))] + 1 : 1
LAZYSET(L, slot_to_string(initial(G.category)), occupied_slots)
switch(slot)
if(slot_in_backpack)
if(L[slot_to_string(slot_in_backpack)] < BACKPACK_SLOT_AMT)
if(SLOT_IN_BACKPACK)
if(L[slot_to_string(SLOT_IN_BACKPACK)] < BACKPACK_SLOT_AMT)
return TRUE
if(slot_hands)
if(L[slot_to_string(slot_hands)] < HANDS_SLOT_AMT)
if(SLOT_HANDS)
if(L[slot_to_string(SLOT_HANDS)] < HANDS_SLOT_AMT)
return TRUE
else
if(L[slot_to_string(slot)] < DEFAULT_SLOT_AMT)
modular_citadel/code/modules/custom_loadout/custom_items.dm
+1 -1
View File
@@ -290,7 +290,7 @@
H = loc
if(!H)
return
else if(H.get_item_by_slot(slot_neck) == src)
else if(H.get_item_by_slot(SLOT_NECK) == src)
if(H.arousalloss < H.max_arousal / 3)
H.arousalloss = H.max_arousal / 3
if(prob(5) && H.hallucination < 15)
modular_citadel/code/modules/custom_loadout/load_to_mob.dm
+1 -1
View File
@@ -52,7 +52,7 @@
loaded_atom.forceMove(T)
continue
var/obj/item/loaded = loaded_atom
var/obj/item/storage/S = H.get_item_by_slot(slot_back)
var/obj/item/storage/S = H.get_item_by_slot(SLOT_BACK)
if(istype(S))
S.SendSignal(COMSIG_TRY_STORAGE_INSERT,loaded, TRUE, H) //Force it into their backpack
continue
modular_citadel/cydonian_armor.dm
+2 -2
View File
@@ -51,7 +51,7 @@
/obj/item/clothing/head/helmet/space/hardsuit/lavaknight/equipped(mob/user, slot)
..()
if(slot == slot_head)
if(slot == SLOT_HEAD)
emissivelights()
/obj/item/clothing/head/helmet/space/hardsuit/lavaknight/dropped(mob/user)
@@ -113,7 +113,7 @@
/obj/item/clothing/suit/space/hardsuit/lavaknight/equipped(mob/user, slot)
..()
if(slot == slot_wear_suit)
if(slot == SLOT_WEAR_SUIT)
emissivelights()
/obj/item/clothing/suit/space/hardsuit/lavaknight/dropped(mob/user)