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

Merge branch 'master' into cargonia-is-glorious!

Browse Source
This commit is contained in:
deathride58
2018-02-06 02:54:58 +00:00
committed by GitHub
parent b7f86583cd d17ccace75
commit 0ecb7ad81b
67 changed files with 80268 additions and 68192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/cargo/packs.dm
+4 -4
View File
@@ -1,9 +1,9 @@
/datum/supply_pack/misc/kinkmate
name = "Kinkmate supply Crate"
name = "Kinkmate construction kit"
cost = 2000
contraband = TRUE
contains = list(/obj/item/vending_refill/kink)
crate_name = "Kinkmate supply crate"
contains = list(/obj/item/vending_refill/kink, /obj/item/circuitboard/machine/kinkmate)
crate_name = "Kinkmate construction kit"
//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Miscellaneous ///////////////////////////////////
@@ -13,4 +13,4 @@
name = "Disco Ball"
cost = 1000000
contains = list(/obj/machinery/disco)
crate_name = "Disco Ball"
crate_name = "Disco Ball"
modular_citadel/code/modules/client/loadout/_donator.dm → modular_citadel/code/modules/client/loadout/__donator.dm
View File
modular_citadel/code/modules/client/loadout/_medical.dm
+5
View File
@@ -0,0 +1,5 @@
/datum/gear/stethoscope
name = "Stethoscope"
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
+71
View File
@@ -0,0 +1,71 @@
/datum/gear/navyblueuniformhos
name = "Head of Security navyblue 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
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
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
path = /obj/item/clothing/suit/security/officer
restricted_roles = list("Security Officer")
/datum/gear/navyblueofficerberet
name = "Security officer's Navyblue beret"
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
path = /obj/item/clothing/under/rank/security/navyblue
restricted_roles = list("Security officer")
/datum/gear/navybluejacketwarden
name = "warden navyblue jacket"
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
path = /obj/item/clothing/head/beret/sec/navywarden
restricted_roles = list("Warden")
/datum/gear/navyblueuniformwarden
name = "Warden navyblue 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
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
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
path = /obj/item/clothing/glasses/hud/security
restricted_roles = list("Security Officer", "Warden", "Head of Security")
modular_citadel/code/modules/client/loadout/_service.dm
+13
View File
@@ -0,0 +1,13 @@
/datum/gear/plushvar
name = "Ratvar Plushie"
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
path = /obj/item/toy/plush/narplush
cost = 5
restricted_roles = list("Chaplain")
modular_citadel/code/modules/client/loadout/backpack.dm
-14
View File
@@ -18,20 +18,6 @@
category = slot_in_backpack
path = /obj/item/toy/plush/slimeplushie
/datum/gear/plushvar
name = "Ratvar Plushie"
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
path = /obj/item/toy/plush/narplush
cost = 5
restricted_roles = list("Chaplain")
/datum/gear/dildo
name = "Customizable dildo"
category = slot_in_backpack
modular_citadel/code/modules/client/loadout/glasses.dm
-6
View File
@@ -42,9 +42,3 @@
name = "Prescription glasses"
category = slot_glasses
path = /obj/item/clothing/glasses/regular
/datum/gear/sechud
name = "Security Hud"
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/head.dm
-18
View File
@@ -47,21 +47,3 @@
name = "Top Hat"
category = slot_head
path = /obj/item/clothing/head/that
/datum/gear/navybluehosberet
name = "Head of security's Naviblue beret"
category = slot_head
path = /obj/item/clothing/head/beret/sec/navyhos
restricted_roles = list("Head of Security")
/datum/gear/navyblueofficerberet
name = "Security officer's Navyblue beret"
category = slot_head
path = /obj/item/clothing/head/beret/sec/navyofficer
restricted_roles = list("Security Officer")
/datum/gear/navybluewardenberet
name = "Warden's navyblue beret"
category = slot_head
path = /obj/item/clothing/head/beret/sec/navywarden
restricted_roles = list("Warden")
modular_citadel/code/modules/client/loadout/neck.dm
-6
View File
@@ -18,12 +18,6 @@
category = slot_neck
path = /obj/item/clothing/neck/petcollar
/datum/gear/stethoscope
name = "Stethoscope"
category = slot_neck
path = /obj/item/clothing/neck/stethoscope
restricted_roles = list("Medical Doctor", "Chief Medical Officer")
/datum/gear/scarf
name = "White scarf"
category = slot_neck
modular_citadel/code/modules/client/loadout/suit.dm
-18
View File
@@ -67,21 +67,3 @@
name = "Ian Shirt"
category = slot_wear_suit
path = /obj/item/clothing/suit/ianshirt
/datum/gear/navybluejackethos
name = "head of security's navyblue jacket"
category = slot_wear_suit
path = /obj/item/clothing/suit/security/hos
restricted_roles = list("Head of Security")
/datum/gear/navybluejacketwarden
name = "warden navyblue jacket"
category = slot_wear_suit
path = /obj/item/clothing/suit/security/warden
restricted_roles = list("Warden")
/datum/gear/navybluejacketofficer
name = "security officer's navyblue jacket"
category = slot_wear_suit
path = /obj/item/clothing/suit/security/officer
restricted_roles = list("Security Officer")
modular_citadel/code/modules/client/loadout/uniform.dm
-32
View File
@@ -78,25 +78,6 @@
category = slot_w_uniform
path = /obj/item/clothing/under/kilt
/datum/gear/navyblueuniformhos
name = "Head of Security navyblue uniform"
category = slot_w_uniform
path = /obj/item/clothing/under/rank/head_of_security/navyblue
restricted_roles = list("Head of Security")
/datum/gear/navyblueuniformwarden
name = "Warden navyblue uniform"
category = slot_w_uniform
path = /obj/item/clothing/under/rank/warden/navyblue
restricted_roles = list("Warden")
/datum/gear/navyblueuniformofficer
name = "security officer navyblue uniform"
category = slot_w_uniform
path = /obj/item/clothing/under/rank/security/navyblue
restricted_roles = list("Security officer")
/datum/gear/camoshorts
name = "Camo Pants"
category = slot_w_uniform
@@ -137,20 +118,7 @@
category = slot_w_uniform
path = /obj/item/clothing/under/pants/track
/datum/gear/secskirt
name = "Security skirt"
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
path = /obj/item/clothing/under/rank/head_of_security/skirt
restricted_roles = list("Head of Security")
/datum/gear/turtleneck
name = "Tactitool Turtleneck"
category = slot_w_uniform
path = /obj/item/clothing/under/syndicate/cosmetic
modular_citadel/code/modules/clothing/under/turtlenecks.dm
+22
View File
@@ -0,0 +1,22 @@
/*
* Turtlenecks in general go here!
*/
//CMO's Turtleneck, because they don't have any unique clothes!
/obj/item/clothing/under/rank/chief_medical_officer/turtleneck
desc = "It's a turtleneck worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection, for an officer with a superior sense of style and practicality."
name = "chief medical officer's turtleneck"
alternate_worn_icon = 'modular_citadel/icons/mob/clothing/turtlenecks.dmi'
icon = 'modular_citadel/icons/obj/clothing/turtlenecks.dmi'
icon_state = "cmoturtle"
item_state = "w_suit"
item_color = "cmoturtle"
permeability_coefficient = 0.5
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0, fire = 0, acid = 0)
can_adjust = TRUE
alt_covers_chest = TRUE
/obj/structure/closet/secure_closet/CMO/PopulateContents() //This is placed here because it's a very specific addition for a very specific niche
..()
new /obj/item/clothing/under/rank/chief_medical_officer/turtleneck(src)