Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
This commit is contained in:
Ghommie
@@ -14,6 +14,10 @@
|
||||
|
||||
var/saved_underwear = ""//saves their underwear so it can be toggled later
|
||||
var/saved_undershirt = ""
|
||||
var/saved_socks = ""
|
||||
var/hidden_underwear = FALSE
|
||||
var/hidden_undershirt = FALSE
|
||||
var/hidden_socks = FALSE
|
||||
|
||||
/mob/living/carbon/human/New()
|
||||
..()
|
||||
@@ -29,6 +33,33 @@
|
||||
var/list/femcum_fluids = list("femcum")
|
||||
|
||||
//Mob procs
|
||||
/mob/living/carbon/human/proc/underwear_toggle()
|
||||
set name = "Toggle undergarments"
|
||||
set category = "Object"
|
||||
if(ishuman(src))
|
||||
var/mob/living/carbon/human/humz = src
|
||||
var/confirm = input(src, "Select what part of your form to alter", "Undergarment Toggling", "Cancel") in list("Top", "Bottom", "Socks", "All", "Cancel")
|
||||
if(confirm == "Top")
|
||||
humz.hidden_undershirt = !humz.hidden_undershirt
|
||||
|
||||
if(confirm == "Bottom")
|
||||
humz.hidden_underwear = !humz.hidden_underwear
|
||||
|
||||
if(confirm == "Socks")
|
||||
humz.hidden_socks = !humz.hidden_socks
|
||||
|
||||
if(confirm == "All")
|
||||
humz.hidden_undershirt = !humz.hidden_undershirt
|
||||
humz.hidden_underwear = !humz.hidden_underwear
|
||||
humz.hidden_socks = !humz.hidden_socks
|
||||
|
||||
if(confirm == "Cancel")
|
||||
return
|
||||
src.update_body()
|
||||
|
||||
else
|
||||
to_chat(src, "Humans only. How the fuck did you get this verb anyway.")
|
||||
|
||||
/mob/living/proc/handle_arousal()
|
||||
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
owner.exposed_genitals += src
|
||||
if("Hidden by clothes")
|
||||
through_clothes = FALSE
|
||||
hidden = FALSE
|
||||
hidden = TRUE
|
||||
if(src in owner.exposed_genitals)
|
||||
owner.exposed_genitals -= src
|
||||
if("Always hidden")
|
||||
@@ -303,6 +303,8 @@
|
||||
for(var/obj/item/organ/O in H.internal_organs)
|
||||
if(isgenital(O))
|
||||
var/obj/item/organ/genital/G = O
|
||||
if(G.hidden)
|
||||
return //we're gunna just hijack this for updates.
|
||||
if(G.is_exposed()) //Checks appropriate clothing slot and if it's through_clothes
|
||||
genitals_to_add += H.getorganslot(G.slot)
|
||||
//Now we added all genitals that aren't internal and should be rendered
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
var/sack_size = BALLS_SACK_SIZE_DEF
|
||||
fluid_id = "semen"
|
||||
producing = TRUE
|
||||
can_masturbate_with = TRUE
|
||||
can_masturbate_with = FALSE
|
||||
masturbation_verb = "massage"
|
||||
can_climax = TRUE
|
||||
var/sent_full_message = TRUE //defaults to 1 since they're full to start
|
||||
|
||||
@@ -4,11 +4,6 @@
|
||||
/obj/machinery/computer/cargo/request
|
||||
req_access = list()
|
||||
|
||||
/obj/machinery/computer/cargo/emag_act(mob/user)
|
||||
. = ..()
|
||||
if(.)
|
||||
req_access = list()
|
||||
|
||||
/obj/machinery/computer/cargo/ui_act(action, params, datum/tgui/ui)
|
||||
if(!allowed(usr))
|
||||
to_chat(usr, "<span class='notice'>Access denied.</span>")
|
||||
|
||||
@@ -404,3 +404,27 @@ datum/gear/darksabresheath
|
||||
category = SLOT_WEAR_SUIT
|
||||
path = /obj/item/clothing/suit/commjacket
|
||||
ckeywhitelist = list("sadisticbatter")
|
||||
|
||||
/datum/gear/mw2_russian_para
|
||||
name = "Russian Paratrooper Jumper"
|
||||
category = SLOT_WEAR_SUIT
|
||||
path = /obj/item/clothing/suit/mw2_russian_para
|
||||
ckeywhitelist = list("investigator77")
|
||||
|
||||
/datum/gear/longblackgloves
|
||||
name = "Luna's Gauntlets"
|
||||
category = SLOT_GLOVES
|
||||
path = /obj/item/clothing/gloves/longblackgloves
|
||||
ckeywhitelist = list("bigmanclancy")
|
||||
|
||||
/datum/gear/trendy_fit
|
||||
name = "Trendy Fit"
|
||||
category = SLOT_W_UNIFORM
|
||||
path = /obj/item/clothing/under/trendy_fit
|
||||
ckeywhitelist = list("midgetdragon")
|
||||
|
||||
/datum/gear/csheet
|
||||
name = "NT Bedsheet"
|
||||
category = SLOT_NECK
|
||||
path = /obj/item/bedsheet/captain
|
||||
ckeywhitelist = list("tikibomb")
|
||||
@@ -1,3 +1,9 @@
|
||||
/datum/gear/greytidestationwide
|
||||
name = "Grey jumpsuit"
|
||||
category = SLOT_W_UNIFORM
|
||||
path = /obj/item/clothing/under/color/grey
|
||||
restricted_roles = list("Assistant")
|
||||
|
||||
/datum/gear/plushvar
|
||||
name = "Ratvar Plushie"
|
||||
category = SLOT_IN_BACKPACK
|
||||
|
||||
@@ -309,8 +309,8 @@
|
||||
restricted_desc = "Engineering and Security"
|
||||
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
|
||||
|
||||
//memes
|
||||
/datum/gear/nudepermit
|
||||
name = "Nudity Permit"
|
||||
//Memes
|
||||
/datum/gear/gear_harnesses
|
||||
name = "Gear Harness"
|
||||
category = SLOT_W_UNIFORM
|
||||
path = /obj/item/clothing/under/permit
|
||||
path = /obj/item/clothing/under/gear_harness
|
||||
@@ -417,7 +417,6 @@
|
||||
icon_state = "flagcape"
|
||||
item_state = "flagcape"
|
||||
|
||||
|
||||
/obj/item/clothing/shoes/lucky
|
||||
name = "Lucky Jackboots"
|
||||
icon = 'icons/obj/custom.dmi'
|
||||
@@ -504,4 +503,28 @@
|
||||
alternate_worn_icon = 'icons/mob/custom_w.dmi'
|
||||
mutantrace_variation = NO_MUTANTRACE_VARIATION
|
||||
|
||||
/obj/item/clothing/suit/mw2_russian_para
|
||||
name = "Russian Paratrooper Jumper"
|
||||
desc = "A Russian made old paratrooper jumpsuit, has many pockets for easy storage of gear from a by gone era. As bulky as it looks, its shockingly light!"
|
||||
icon_state = "mw2_russian_para"
|
||||
item_state = "mw2_russian_para"
|
||||
icon = 'icons/obj/custom.dmi'
|
||||
alternate_worn_icon = 'icons/mob/custom_w.dmi'
|
||||
mutantrace_variation = NO_MUTANTRACE_VARIATION
|
||||
|
||||
/obj/item/clothing/gloves/longblackgloves
|
||||
name = "Luna's Gauntlets"
|
||||
desc = "These gloves seem to have a coating of slime fluid on them, you should possibly return them to their rightful owner."
|
||||
icon_state = "longblackgloves"
|
||||
item_state = "longblackgloves"
|
||||
icon = 'icons/obj/custom.dmi'
|
||||
alternate_worn_icon = 'icons/mob/custom_w.dmi'
|
||||
|
||||
/obj/item/clothing/under/trendy_fit
|
||||
name = "Trendy Fitting Clothing"
|
||||
desc = "An outfit straight from the boredom of space, its the type of thing only someone trying to entertain themselves on the way to their next destination would wear."
|
||||
icon_state = "trendy_fit"
|
||||
item_state = "trendy_fit"
|
||||
icon = 'icons/obj/custom.dmi'
|
||||
alternate_worn_icon = 'icons/mob/custom_w.dmi'
|
||||
mutantrace_variation = NO_MUTANTRACE_VARIATION
|
||||
@@ -183,6 +183,7 @@
|
||||
key_third_person = "suddenly hits a dab"
|
||||
message = "suddenly hits a dab!"
|
||||
emote_type = EMOTE_AUDIBLE
|
||||
restraint_check = TRUE
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -191,6 +191,32 @@
|
||||
icon = 'modular_citadel/icons/mob/mam_ears.dmi'
|
||||
color_src = MATRIXED
|
||||
|
||||
/datum/sprite_accessory/ears/human/bigwolf
|
||||
name = "Big Wolf"
|
||||
icon_state = "bigwolf"
|
||||
icon = 'modular_citadel/icons/mob/mam_ears.dmi'
|
||||
color_src = MATRIXED
|
||||
|
||||
/datum/sprite_accessory/ears/human/bigwolfinner
|
||||
name = "Big Wolf (ALT)"
|
||||
icon_state = "bigwolfinner"
|
||||
hasinner = 1
|
||||
icon = 'modular_citadel/icons/mob/mam_ears.dmi'
|
||||
color_src = MATRIXED
|
||||
|
||||
/datum/sprite_accessory/ears/human/bigwolfdark
|
||||
name = "Dark Big Wolf"
|
||||
icon_state = "bigwolfdark"
|
||||
icon = 'modular_citadel/icons/mob/mam_ears.dmi'
|
||||
color_src = MATRIXED
|
||||
|
||||
/datum/sprite_accessory/ears/human/bigwolfinnerdark
|
||||
name = "Dark Big Wolf (ALT)"
|
||||
icon_state = "bigwolfinnerdark"
|
||||
hasinner = 1
|
||||
icon = 'modular_citadel/icons/mob/mam_ears.dmi'
|
||||
color_src = MATRIXED
|
||||
|
||||
/datum/sprite_accessory/ears/human/cow
|
||||
name = "Cow"
|
||||
icon_state = "cow"
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
M.adjustStaminaLoss(-5*REM)
|
||||
. = ..()
|
||||
|
||||
/datum/reagent/syndicateadrenals/on_mob_add(mob/living/M)
|
||||
/datum/reagent/syndicateadrenals/on_mob_metabolize(mob/living/M)
|
||||
. = ..()
|
||||
if(istype(M))
|
||||
M.next_move_modifier *= 0.5
|
||||
to_chat(M, "<span class='notice'>You feel an intense surge of energy rushing through your veins.</span>")
|
||||
|
||||
/datum/reagent/syndicateadrenals/on_mob_delete(mob/living/M)
|
||||
/datum/reagent/syndicateadrenals/on_mob_end_metabolize(mob/living/M)
|
||||
. = ..()
|
||||
if(istype(M))
|
||||
M.next_move_modifier *= 2
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
"purple hypovial" = "hypovial-p",
|
||||
"black hypovial" = "hypovial-t"
|
||||
)
|
||||
always_reskinnable = TRUE
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/vial/Initialize()
|
||||
. = ..()
|
||||
@@ -29,17 +30,6 @@
|
||||
/obj/item/reagent_containers/glass/bottle/vial/on_reagent_change()
|
||||
update_icon()
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/vial/reskin_obj(mob/M) //Makes the vials completely reskinnable, and renames them - overrides /obj/proc/reskin_obj
|
||||
if(!LAZYLEN(unique_reskin))
|
||||
return
|
||||
var/choice = input(M,"Do you wish to recolour your [src]?","Vial Recolour") as null|anything in unique_reskin
|
||||
if(!QDELETED(src) && choice && !current_skin && !M.incapacitated() && in_range(M,src))
|
||||
if(!unique_reskin[choice])
|
||||
return
|
||||
icon_state = unique_reskin[choice]
|
||||
name = choice
|
||||
to_chat(M, "[src] is now skinned as '[choice].'")
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/vial/update_icon()
|
||||
cut_overlays()
|
||||
if(reagents.total_volume)
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
display_name = "Games and Toys"
|
||||
description = "For the slackers on the station."
|
||||
prereq_ids = list("comptech")
|
||||
design_ids = list("arcade_battle", "arcade_orion", "slotmachine", "autoylathe")
|
||||
design_ids = list("arcade_battle", "arcade_orion", "arcade_minesweeper", "slotmachine", "autoylathe")
|
||||
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000)
|
||||
export_price = 5000
|
||||
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
/*
|
||||
// PUT ALL YOUR NEW UPLINK STUFF HERE, OVERRIDES GO IN HERE TOO
|
||||
*/
|
||||
|
||||
/datum/uplink_item/device_tools/emagrecharge
|
||||
name = "Electromagnet Charging Device"
|
||||
desc = "A small device intended for recharging Cryptographic Sequencers. Using it will add five extra charges to the Cryptographic Sequencer."
|
||||
item = /obj/item/emagrecharge
|
||||
cost = 2
|
||||
|
||||
/datum/uplink_item/dangerous/revolver
|
||||
item = /obj/item/gun/ballistic/revolver/syndie
|
||||
|
||||
/datum/uplink_item/dangerous/phantomthief
|
||||
name = "Syndicate Mask"
|
||||
desc = "A cheap plastic mask fitted with an adrenaline autoinjector, which can be used by simply tensing your muscles"
|
||||
item = /obj/item/clothing/glasses/phantomthief/syndicate
|
||||
cost = 2
|
||||
Reference in New Issue
Block a user