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

Merge branch 'master' into upstream-merge-37529

Browse Source
This commit is contained in:
LetterJay
2018-05-22 08:02:46 -05:00
committed by GitHub
parent 488842a520 b3e5513185
commit 06b7cdf27a
1106 changed files with 20660 additions and 18727 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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/datums/traits/neutral.dm
+8 -8
View File
@@ -1,24 +1,24 @@
// Citadel-specific Neutral Traits
/datum/trait/libido
/datum/quirk/libido
name = "Nymphomania"
desc = "You're always feeling a bit in heat. Also, you get aroused faster than usual."
value = 0
gain_text = "<span class='notice'>You are feeling extra wild.</span>"
lose_text = "<span class='notice'>You don't feel that burning sensation anymore.</span>"
/datum/trait/libido/add()
var/mob/living/M = trait_holder
/datum/quirk/libido/add()
var/mob/living/M = quirk_holder
M.min_arousal = 16
M.arousal_rate = 3
/datum/trait/libido/remove()
var/mob/living/M = trait_holder
/datum/quirk/libido/remove()
var/mob/living/M = quirk_holder
M.min_arousal = initial(M.min_arousal)
M.arousal_rate = initial(M.arousal_rate)
/datum/trait/libido/on_process()
var/mob/living/M = trait_holder
/datum/quirk/libido/on_process()
var/mob/living/M = quirk_holder
if(M.canbearoused == FALSE)
to_chat(trait_holder, "<span class='notice'>Having high libido is useless when you can't feel arousal at all!</span>")
to_chat(quirk_holder, "<span class='notice'>Having high libido is useless when you can't feel arousal at all!</span>")
qdel(src)
modular_citadel/code/game/machinery/cryopod.dm
+4 -4
View File
@@ -144,9 +144,9 @@
var/list/preserve_items = list(
/obj/item/hand_tele,
/obj/item/card/id/captains_spare,
/obj/item/device/aicard,
/obj/item/device/mmi,
/obj/item/device/paicard,
/obj/item/aicard,
/obj/item/mmi,
/obj/item/paicard,
/obj/item/gun,
/obj/item/pinpointer,
/obj/item/clothing/shoes/magboots,
@@ -165,7 +165,7 @@
)
// These items will NOT be preserved
var/list/do_not_preserve_items = list (
/obj/item/device/mmi/posibrain
/obj/item/mmi/posibrain
)
/obj/machinery/cryopod/Initialize()
modular_citadel/code/game/machinery/vending.dm
+5 -5
View File
@@ -1,12 +1,12 @@
/obj/machinery/vending/security
contraband = list(/obj/item/clothing/glasses/sunglasses = 2, /obj/item/storage/fancy/donut_box = 2, /obj/item/device/ssword_kit = 1)
premium = list(/obj/item/coin/antagtoken = 1, /obj/item/device/ssword_kit = 1)
contraband = list(/obj/item/clothing/glasses/sunglasses = 2, /obj/item/storage/fancy/donut_box = 2, /obj/item/ssword_kit = 1)
premium = list(/obj/item/coin/antagtoken = 1, /obj/item/ssword_kit = 1)
/obj/machinery/vending/medical
products = list(/obj/item/reagent_containers/syringe = 12,
/obj/item/reagent_containers/dropper = 3,
/obj/item/device/healthanalyzer = 4,
/obj/item/device/sensor_device = 2,
/obj/item/healthanalyzer = 4,
/obj/item/sensor_device = 2,
/obj/item/pinpointer/crew = 2,
/obj/item/reagent_containers/medspray/sterilizine = 1,
/obj/item/stack/medical/gauze = 8,
@@ -50,7 +50,7 @@
/obj/item/clothing/under/mankini = 1,
/obj/item/dildo/flared/huge = 1
)
premium = list(/obj/item/device/electropack/shockcollar = 3)
premium = list(/obj/item/electropack/shockcollar = 3)
refill_canister = /obj/item/vending_refill/kink
/*
/obj/machinery/vending/nazivend
modular_citadel/code/game/machinery/wishgranter.dm
+1 -1
View File
@@ -65,7 +65,7 @@
user.dna.add_mutation(BLINDMUT)
user.adjust_eye_damage(100)
var/list/destinations = list()
for(var/obj/item/device/beacon/B in GLOB.teleportbeacons)
for(var/obj/item/beacon/B in GLOB.teleportbeacons)
var/turf/T = get_turf(B)
if(is_station_level(T.z))
destinations += B
modular_citadel/code/game/objects/items/devices/PDA/PDA.dm
+1 -1
View File
@@ -1,4 +1,4 @@
//Overrides TG's PDA sprites with Cit's PDA sprites. Remind me to turn this into a pref somewhere down the line.
/obj/item/device/pda
/obj/item/pda
icon = 'modular_citadel/icons/obj/pda.dmi'
modular_citadel/code/game/objects/items/devices/aicard.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/obj/item/device/aicard/potato
/obj/item/aicard/potato
name = "Potat-OS"
desc = "A storage device for possibly malfunctioning AIs. Go on. Get a big fat eyeful. With your big fat eyes."
icon = 'modular_citadel/icons/aicards.dmi'
modular_citadel/code/game/objects/items/devices/flashlight.dm
+8 -8
View File
@@ -1,31 +1,31 @@
/obj/item/device/flashlight
/obj/item/flashlight
light_color = "#FFCC66"
flashlight_power = 0.8
/obj/item/device/flashlight/pen
/obj/item/flashlight/pen
light_color = "#FFDDCC"
flashlight_power = 0.3
/obj/item/device/flashlight/seclite
/obj/item/flashlight/seclite
light_color = "#CDDDFF"
flashlight_power = 0.9
/obj/item/device/flashlight/lamp
/obj/item/flashlight/lamp
light_color = "#FFDDBB"
flashlight_power = 0.8
/obj/item/device/flashlight/flare
/obj/item/flashlight/flare
light_color = "#FA421A"
flashlight_power = 0.8
/obj/item/device/flashlight/flare/torch
/obj/item/flashlight/flare/torch
light_color = "#FAA44B"
flashlight_power = 0.8
/obj/item/device/flashlight/lantern
/obj/item/flashlight/lantern
light_color = "#FFAA44"
flashlight_power = 0.75
/obj/item/device/flashlight/slime
/obj/item/flashlight/slime
light_color = "#FFEEAA"
flashlight_power = 0.6
modular_citadel/code/game/objects/items/devices/radio/encryptionkey.dm
+2 -2
View File
@@ -1,10 +1,10 @@
/obj/item/device/encryptionkey/heads/qm
/obj/item/encryptionkey/heads/qm
name = "\proper the quartermaster's encryption key"
desc = "An encryption key for a radio headset. Channels are as follows: :u - supply, :c - command."
icon_state = "hop_cypherkey"
channels = list("Supply" = 1, "Command" = 1)
/obj/item/device/encryptionkey/heads/hop
/obj/item/encryptionkey/heads/hop
desc = "An encryption key for a radio headset. Channels are as follows: :v - service, :c - command."
channels = list("Service" = 1, "Command" = 1)
modular_citadel/code/game/objects/items/devices/radio/headset.dm
+4 -4
View File
@@ -1,10 +1,10 @@
/obj/item/device/radio/headset/heads/qm
/obj/item/radio/headset/heads/qm
name = "\proper the quartermaster's headset"
desc = "The headset of the king (or queen) of paperwork.\nChannels are as follows: :u - supply, :c - command."
icon_state = "com_headset"
keyslot = new /obj/item/device/encryptionkey/heads/qm
keyslot = new /obj/item/encryptionkey/heads/qm
/obj/item/device/radio/headset/heads/hop
/obj/item/radio/headset/heads/hop
desc = "The headset of the guy who will one day be captain.\nChannels are as follows: :v - service, :c - command."
keyslot = new /obj/item/device/encryptionkey/heads/hop
keyslot = new /obj/item/encryptionkey/heads/hop
modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm
+6 -6
View File
@@ -1,4 +1,4 @@
/obj/item/device/electropack/shockcollar
/obj/item/electropack/shockcollar
name = "shock collar"
desc = "A reinforced metal collar. It seems to have some form of wiring near the front. Strange.."
icon = 'modular_citadel/icons/obj/clothing/cit_neck.dmi'
@@ -17,19 +17,19 @@
name = "Shockcollar"
id = "shockcollar"
build_type = AUTOLATHE
build_path = /obj/item/device/electropack/shockcollar
build_path = /obj/item/electropack/shockcollar
materials = list(MAT_METAL=5000, MAT_GLASS=2000)
category = list("hacked", "Misc")
/obj/item/device/electropack/shockcollar/attack_hand(mob/user)
/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
..()
/obj/item/device/electropack/shockcollar/receive_signal(datum/signal/signal)
/obj/item/electropack/shockcollar/receive_signal(datum/signal/signal)
if(!signal || signal.data["code"] != code)
return
@@ -53,7 +53,7 @@
master.receive_signal()
return
/obj/item/device/electropack/shockcollar/attack_self(mob/user) //Turns out can't fully source this from the parent item, spritepath gets confused if power toggled. Will come back to this when I know how to code better and readd powertoggle..
/obj/item/electropack/shockcollar/attack_self(mob/user) //Turns out can't fully source this from the parent item, spritepath gets confused if power toggled. Will come back to this when I know how to code better and readd powertoggle..
var/option = "Change Name"
option = input(user, "What do you want to do?", "[src]", option) as null|anything in list("Change Name", "Change Frequency")
switch(option)
modular_citadel/code/game/objects/items/stunsword.dm
+1 -1
View File
@@ -7,7 +7,7 @@
lefthand_file = 'modular_citadel/icons/mob/inhands/stunsword_left.dmi'
righthand_file = 'modular_citadel/icons/mob/inhands/stunsword_right.dmi'
/obj/item/device/ssword_kit
/obj/item/ssword_kit
name = "stunsword kit"
desc = "a modkit for making a stunbaton into a stunsword"
icon = 'icons/obj/vending_restock.dmi'
modular_citadel/code/game/objects/structures/crates_lockers/closets/secure/citadel_lockers.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/quartermaster/PopulateContents()
..()
new /obj/item/device/radio/headset/heads/qm(src)
new /obj/item/radio/headset/heads/qm(src)
/obj/structure/closet/secure_closet/CMO/PopulateContents()
..()
modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_civilian.dm
+1 -1
View File
@@ -127,7 +127,7 @@
/datum/objective/crew/slipster/check_completion()
var/list/uniqueslips = list()
if(owner && owner.current)
for(var/obj/item/device/pda/clown/PDA in owner.current.get_contents())
for(var/obj/item/pda/clown/PDA in owner.current.get_contents())
for(var/mob/living/carbon/human/H in PDA.slipvictims)
uniqueslips |= H
if(uniqueslips.len >= target_amount)
modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_engineering.dm
+1 -1
View File
@@ -29,6 +29,6 @@
/datum/objective/crew/poly/check_completion()
for(var/mob/living/simple_animal/parrot/Poly/dumbbird in GLOB.mob_list)
if(!(dumbbird.stat == DEAD) && dumbbird.ears)
if(istype(dumbbird.ears, /obj/item/device/radio/headset))
if(istype(dumbbird.ears, /obj/item/radio/headset))
return TRUE
return FALSE
modular_citadel/code/modules/client/loadout/__donator.dm
+57 -45
View File
@@ -2,273 +2,285 @@
/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
path = /obj/item/ssword_kit
ckeywhitelist = list("phillip458")
/datum/gear/techcoat
name = "Techomancers Labcoat"
category = SLOT_IN_BACKPACK
path = /obj/item/clothing/suit/toggle/labcoat/mad/techcoat
ckeywhitelist = list("wilchen")
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
+2 -2
View File
@@ -1,4 +1,4 @@
/datum/gear/fingerless
name = "Fingerless Gloves"
category = slot_gloves
path = /obj/item/clothing/gloves/fingerless
category = SLOT_GLOVES
path = /obj/item/clothing/gloves/fingerless
modular_citadel/code/modules/client/loadout/hands.dm
+18 -12
View File
@@ -1,61 +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
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
+6 -1
View File
@@ -1,4 +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
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
+26 -20
View File
@@ -1,76 +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
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",
@@ -79,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")
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/clothing/spacesuits/flightsuit.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/obj/item/device/flightpack
/obj/item/flightpack
armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 20, "fire" = 20, "acid" = 20)
/obj/item/clothing/suit/space/hardsuit/flightsuit
modular_citadel/code/modules/clothing/suits/suits.dm
+14 -1
View File
@@ -10,4 +10,17 @@
desc = "A trenchcoat enchanced with a special lightweight kevlar. This one appears to be designed to be draped over one's shoulders rather than worn normally.."
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
icon_state = "hostrench"
item_state = "hostrench"
item_state = "hostrench"
/obj/item/clothing/suit/hooded/cloak/david
name = "red cloak"
icon_state = "goliath_cloak"
desc = "Ever wanted to look like a badass without ANY effort? Try this nanotrasen brand red cloak, perfect for kids"
hoodtype = /obj/item/clothing/head/hooded/cloakhood/david
body_parts_covered = CHEST|GROIN|ARMS
/obj/item/clothing/head/hooded/cloakhood/david
name = "red cloak hood"
icon_state = "golhood"
desc = "conceal your face in shame with this nanotrasen brand hood"
flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR
modular_citadel/code/modules/clothing/under/trek_under.dm
+10 -10
View File
@@ -99,9 +99,9 @@
body_parts_covered = CHEST|GROIN|ARMS
permeability_coefficient = 0.50
allowed = list(
/obj/item/device/flashlight, /obj/item/device/analyzer,
/obj/item/device/radio, /obj/item/tank/internals/emergency_oxygen,
/obj/item/reagent_containers/hypospray, /obj/item/device/healthanalyzer,/obj/item/reagent_containers/syringe,
/obj/item/flashlight, /obj/item/analyzer,
/obj/item/radio, /obj/item/tank/internals/emergency_oxygen,
/obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer,/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/glass/bottle/vial,/obj/item/reagent_containers/glass/beaker,
/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle, /obj/item/restraints/handcuffs,/obj/item/hypospray
)
@@ -146,20 +146,20 @@
body_parts_covered = CHEST|GROIN|ARMS
allowed = list(
/obj/item/tank/internals/emergency_oxygen,
/obj/item/device/flashlight,
/obj/item/device/analyzer,
/obj/item/device/radio,
/obj/item/flashlight,
/obj/item/analyzer,
/obj/item/radio,
/obj/item/gun,
/obj/item/melee/baton,
/obj/item/restraints/handcuffs,
/obj/item/reagent_containers/hypospray,
/obj/item/hypospray,
/obj/item/device/healthanalyzer,
/obj/item/healthanalyzer,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/glass/bottle/vial,
/obj/item/reagent_containers/glass/beaker,
/obj/item/storage/pill_bottle,
/obj/item/device/taperecorder)
/obj/item/taperecorder)
armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 5, "rad" = 10, "fire" = 10, "acid" = 0)
var/unbuttoned = 0
@@ -212,11 +212,11 @@
body_parts_covered = CHEST|GROIN|ARMS
allowed = list(
/obj/item/tank/internals/emergency_oxygen,
/obj/item/device/flashlight,
/obj/item/flashlight,
/obj/item/gun,
/obj/item/melee/baton,
/obj/item/restraints/handcuffs,
/obj/item/device/taperecorder)
/obj/item/taperecorder)
armor = list("melee" = 45, "bullet" = 25, "laser" = 25,"energy" = 25, "bomb" = 25, "bio" = 25, "rad" = 50, "fire" = 50, "acid" = 50)
//Variants
modular_citadel/code/modules/crafting/recipes.dm
+2 -2
View File
@@ -6,6 +6,6 @@
/datum/crafting_recipe/potatos
name = "Potat-OS"
reqs = list(/obj/item/stack/cable_coil = 1, /obj/item/stack/rods = 1, /obj/item/reagent_containers/food/snacks/grown/potato = 1, /obj/item/device/aicard = 1 )
result = /obj/item/device/aicard/potato
reqs = list(/obj/item/stack/cable_coil = 1, /obj/item/stack/rods = 1, /obj/item/reagent_containers/food/snacks/grown/potato = 1, /obj/item/aicard = 1 )
result = /obj/item/aicard/potato
category = CAT_ROBOT
modular_citadel/code/modules/custom_loadout/custom_items.dm
+9 -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)
@@ -343,3 +343,11 @@
desc = "A piece of paper folded into neat little hat."
icon_state = "paperhat"
item_state = "paperhat"
/obj/item/clothing/suit/toggle/labcoat/mad/techcoat
name = "Techomancers Labcoat"
desc = "An oddly special looking coat."
icon = 'icons/obj/custom.dmi'
icon_state = "rdcoat"
icon_override = 'icons/mob/custom_w.dmi'
item_state = "rdcoat"
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/code/modules/jobs/job_types/cargo_service.dm
+2 -2
View File
@@ -15,8 +15,8 @@
/datum/outfit/job/quartermaster
id = /obj/item/card/id/silver
ears = /obj/item/device/radio/headset/heads/qm
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/device/modular_computer/tablet/preset/advanced = 1)
ears = /obj/item/radio/headset/heads/qm
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
/datum/job/cargo_tech
department_head = list("Quartermaster")
modular_citadel/code/modules/mob/living/carbon/human/life.dm
+1 -1
View File
@@ -7,7 +7,7 @@
/mob/living/carbon/human/calculate_affecting_pressure(pressure)
if(ismob(loc))
return ONE_ATMOSPHERE
if(istype(loc, /obj/item/device/dogborg/sleeper))
if(istype(loc, /obj/item/dogborg/sleeper))
return ONE_ATMOSPHERE
. = ..()
modular_citadel/code/modules/mob/living/silicon/robot/dogborg archive.dm
+12 -12
View File
@@ -9,10 +9,10 @@
modules += new /obj/item/wrench(src)
modules += new /obj/item/crowbar(src)
modules += new /obj/item/wirecutters(src)
modules += new /obj/item/device/multitool(src)
modules += new /obj/item/device/t_scanner(src)
modules += new /obj/item/device/analyzer(src)
modules += new /obj/item/device/assembly/signaler
modules += new /obj/item/multitool(src)
modules += new /obj/item/t_scanner(src)
modules += new /obj/item/analyzer(src)
modules += new /obj/item/assembly/signaler
modules += new /obj/item/soap/nanotrasen(src)
fix_modules()
@@ -26,10 +26,10 @@
modules += new /obj/item/dogborg/pounce(src)
modules += new /obj/item/clothing/mask/gas/sechailer/cyborg(src)
modules += new /obj/item/soap/tongue(src)
modules += new /obj/item/device/analyzer/nose(src)
modules += new /obj/item/analyzer/nose(src)
modules += new /obj/item/storage/bag/borgdelivery(src)
//modules += new /obj/item/device/assembly/signaler(src)
//modules += new /obj/item/device/detective_scanner(src)
//modules += new /obj/item/assembly/signaler(src)
//modules += new /obj/item/detective_scanner(src)
modules += new /obj/item/gun/energy/disabler/cyborg(src)
emag = new /obj/item/gun/energy/laser/cyborg(src)
fix_modules()
@@ -54,8 +54,8 @@
modules += new /obj/item/dogborg/jaws/small(src)
modules += new /obj/item/storage/bag/borgdelivery(src)
modules += new /obj/item/soap/tongue(src)
modules += new /obj/item/device/healthanalyzer(src)
modules += new /obj/item/device/analyzer/nose(src)
modules += new /obj/item/healthanalyzer(src)
modules += new /obj/item/analyzer/nose(src)
emag = new /obj/item/dogborg/pounce(src)
fix_modules()
@@ -66,11 +66,11 @@
..()
modules += new /obj/item/dogborg/jaws/small(src)
modules += new /obj/item/storage/bag/borgdelivery(src)
modules += new /obj/item/device/analyzer/nose(src)
modules += new /obj/item/analyzer/nose(src)
modules += new /obj/item/soap/tongue(src)
modules += new /obj/item/device/healthanalyzer(src)
modules += new /obj/item/healthanalyzer(src)
modules += new /obj/item/dogborg/sleeper(src)
modules += new /obj/item/twohanded/shockpaddles/hound(src)
modules += new /obj/item/device/sensor_device(src)
modules += new /obj/item/sensor_device(src)
emag = new /obj/item/dogborg/pounce(src)
fix_modules()
modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm
+3 -3
View File
@@ -82,7 +82,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
//Boop
/obj/item/device/analyzer/nose
/obj/item/analyzer/nose
name = "boop module"
icon = 'icons/mob/dogborg.dmi'
icon_state = "nose"
@@ -93,7 +93,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
attack_verb = list("nuzzled", "nosed", "booped")
w_class = 1
/obj/item/device/analyzer/nose/attack_self(mob/user)
/obj/item/analyzer/nose/attack_self(mob/user)
user.visible_message("[user] sniffs around the air.", "<span class='warning'>You sniff the air for gas traces.</span>")
var/turf/location = user.loc
@@ -148,7 +148,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
to_chat(user, "<span class='alert'>[env_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] %</span>")
to_chat(user, "<span class='info'>Temperature: [round(environment.temperature-T0C)] &deg;C</span>")
/obj/item/device/analyzer/nose/AltClick(mob/user) //Barometer output for measuring when the next storm happens
/obj/item/analyzer/nose/AltClick(mob/user) //Barometer output for measuring when the next storm happens
. = ..()
//Delivery
modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm
+16 -16
View File
@@ -36,8 +36,8 @@
/obj/item/dogborg/pounce,
/obj/item/clothing/mask/gas/sechailer/cyborg,
/obj/item/soap/tongue,
/obj/item/device/analyzer/nose,
/obj/item/device/dogborg/sleeper/K9,
/obj/item/analyzer/nose,
/obj/item/dogborg/sleeper/K9,
/obj/item/gun/energy/disabler/cyborg,
/obj/item/pinpointer/crew)
emag_modules = list(/obj/item/gun/energy/laser/cyborg)
@@ -63,14 +63,14 @@
basic_modules = list(
/obj/item/dogborg/jaws/small,
/obj/item/storage/bag/borgdelivery,
/obj/item/device/analyzer/nose,
/obj/item/analyzer/nose,
/obj/item/soap/tongue,
/obj/item/device/healthanalyzer,
/obj/item/device/dogborg/sleeper/medihound,
/obj/item/healthanalyzer,
/obj/item/dogborg/sleeper/medihound,
/obj/item/reagent_containers/borghypo,
/obj/item/twohanded/shockpaddles/cyborg/hound,
/obj/item/stack/medical/gauze/cyborg,
/obj/item/device/sensor_device)
/obj/item/sensor_device)
emag_modules = list(/obj/item/dogborg/pounce)
ratvar_modules = list(/obj/item/clockwork/slab/cyborg/medical,
/obj/item/clockwork/weapon/ratvarian_spear)
@@ -88,10 +88,10 @@
name = "Janitor"
basic_modules = list(
/obj/item/dogborg/jaws/small,
/obj/item/device/analyzer/nose,
/obj/item/analyzer/nose,
/obj/item/soap/tongue/scrubpup,
/obj/item/device/lightreplacer/cyborg,
/obj/item/device/dogborg/sleeper/compactor)
/obj/item/lightreplacer/cyborg,
/obj/item/dogborg/sleeper/compactor)
emag_modules = list(/obj/item/dogborg/pounce)
ratvar_modules = list(
/obj/item/clockwork/slab/cyborg/janitor,
@@ -108,7 +108,7 @@
/obj/item/robot_module/scrubpup/respawn_consumable(mob/living/silicon/robot/R, coeff = 1)
..()
var/obj/item/device/lightreplacer/LR = locate(/obj/item/device/lightreplacer) in basic_modules
var/obj/item/lightreplacer/LR = locate(/obj/item/lightreplacer) in basic_modules
if(LR)
for(var/i in 1 to coeff)
LR.Charge(R)
@@ -122,9 +122,9 @@
basic_modules = list(
/obj/item/dogborg/jaws/small,
/obj/item/storage/bag/borgdelivery,
/obj/item/device/analyzer/nose,
/obj/item/analyzer/nose,
/obj/item/soap/tongue,
/obj/item/device/healthanalyzer,
/obj/item/healthanalyzer,
/obj/item/borg/cyborghug)
emag_modules = list(/obj/item/dogborg/pounce)
ratvar_modules = list(
@@ -142,17 +142,17 @@
name = "Ore Pup"
basic_modules = list(
/obj/item/storage/bag/ore/cyborg,
/obj/item/device/analyzer/nose,
/obj/item/analyzer/nose,
/obj/item/storage/bag/borgdelivery,
/obj/item/device/dogborg/sleeper/ore,
/obj/item/dogborg/sleeper/ore,
/obj/item/pickaxe/drill/cyborg,
/obj/item/shovel,
/obj/item/crowbar/cyborg,
/obj/item/weldingtool/mini,
/obj/item/extinguisher/mini,
/obj/item/device/t_scanner/adv_mining_scanner,
/obj/item/t_scanner/adv_mining_scanner,
/obj/item/gun/energy/kinetic_accelerator/cyborg,
/obj/item/device/gps/cyborg)
/obj/item/gps/cyborg)
emag_modules = list(/obj/item/dogborg/pounce)
ratvar_modules = list(
/obj/item/clockwork/slab/cyborg/miner,
modular_citadel/code/modules/projectiles/guns/ballistic/flechette.dm
+1 -1
View File
@@ -63,7 +63,7 @@
item_state = "gun"
w_class = WEIGHT_CLASS_NORMAL
slot_flags = 0
/obj/item/device/firing_pin/implant/pindicate
/obj/item/firing_pin/implant/pindicate
mag_type = /obj/item/ammo_box/magazine/flechette/
fire_sound = 'sound/weapons/gunshot_smg.ogg'
can_suppress = 0
modular_citadel/code/modules/projectiles/guns/ballistic/handguns.dm
+1 -1
View File
@@ -28,7 +28,7 @@
/obj/item/gun/ballistic/automatic/pistol/antitank/syndicate
name = "Syndicate Anti Tank Pistol"
desc = "A massively impractical and silly monstrosity of a pistol that fires .50 calliber rounds. The recoil is likely to dislocate a variety of joints without proper bracing."
pin = /obj/item/device/firing_pin/implant/pindicate
pin = /obj/item/firing_pin/implant/pindicate
///foam stealth pistol///
modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm
+1 -1
View File
@@ -105,7 +105,7 @@
item_state = "gun"
w_class = WEIGHT_CLASS_NORMAL
slot_flags = 0
/obj/item/device/firing_pin/implant/pindicate
/obj/item/firing_pin/implant/pindicate
mag_type = /obj/item/ammo_box/magazine/flechette/
fire_sound = 'sound/weapons/gunshot_smg.ogg'
can_suppress = 0
modular_citadel/code/modules/vore/eating/digest_act_vr.dm
+4 -4
View File
@@ -31,9 +31,9 @@
return FALSE
/obj/item/disk/nuclear/digest_act(...)
return FALSE
/obj/item/device/perfect_tele_beacon/digest_act(...)
/obj/item/perfect_tele_beacon/digest_act(...)
return FALSE //Sorta important to not digest your own beacons.
/obj/item/device/pda/digest_act(...)
/obj/item/pda/digest_act(...)
return FALSE
/obj/item/gun/digest_act(...)
return FALSE
@@ -73,7 +73,7 @@
/////////////
/*
//PDAs need to lose their ID to not take it with them, so we can get a digested ID
/obj/item/device/pda/digest_act(var/atom/movable/item_storage = null)
/obj/item/pda/digest_act(var/atom/movable/item_storage = null)
if(id)
id = null
@@ -114,6 +114,6 @@
/////////////
// Some more complicated stuff
/////////////
/obj/item/device/mmi/digital/posibrain/digest_act(var/atom/movable/item_storage = null)
/obj/item/mmi/digital/posibrain/digest_act(var/atom/movable/item_storage = null)
//Replace this with a VORE setting so all types of posibrains can/can't be digested on a whim
return FALSE
modular_citadel/code/modules/vore/eating/living_vr.dm
+4 -4
View File
@@ -254,8 +254,8 @@
log_attack("[attacker] attempted to feed [H.contents] to [src] ([src.type]) but it failed.")
// I just can't imagine this not being complained about
//Handle case: /obj/item/device/radio/beacon
if(/obj/item/device/radio/beacon)
//Handle case: /obj/item/radio/beacon
if(/obj/item/radio/beacon)
var/confirm = alert(user, "[src == user ? "Eat the beacon?" : "Feed the beacon to [src]?"]", "Confirmation", "Yes!", "Cancel")
if(confirm == "Yes!")
var/bellychoice = input("Which belly?","Select A Belly") in src.vore_organs
@@ -333,8 +333,8 @@
SA.update_icons()
//You're in a dogborg!
else if(istype(loc, /obj/item/device/dogborg/sleeper))
var/obj/item/device/dogborg/sleeper/belly = loc //The belly!
else if(istype(loc, /obj/item/dogborg/sleeper))
var/obj/item/dogborg/sleeper/belly = loc //The belly!
var/confirm = alert(src, "You're in a dogborg sleeper. This is for escaping from preference-breaking or if your predator disconnects/AFKs. You can also resist out naturally too.", "Confirmation", "Okay", "Cancel")
if(!confirm == "Okay" || loc != belly)