cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-07-20 20:22:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'master' into fairylights"

Browse Source 
This reverts commit 2947727659, reversing
changes made to 91063fe882.
This commit is contained in:
Dahlular
2022-07-09 04:55:33 -06:00
parent eb22b66720
commit e51460cb5d
123 changed files with 2065 additions and 3633 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hyperstation/code/effects/lighting.dm
-18
View File
@@ -1,18 +0,0 @@
/obj/effect/light/
name = "bloom"
icon = 'hyperstation/icons/effects/lighting.dmi'
icon_state = "light"
plane = ABOVE_LIGHTING_PLANE
blend_mode = BLEND_ADD
mouse_opacity = 0
anchored = TRUE //no more flying around.
/obj/effect/light/medium
icon = 'hyperstation/icons/effects/lightingmed.dmi'
pixel_x = -16
pixel_y = -16
/obj/effect/light/large
icon = 'hyperstation/icons/effects/lightinglarge.dmi'
pixel_x = -48
pixel_y = -48
hyperstation/code/game/objects/items/devices/radio/radio.dm
-2
View File
@@ -1,2 +0,0 @@
/obj/item/radio
var/list/extra_channels = list() //Allows indivudal channels, used for borgs
hyperstation/code/game/objects/railings.dm
-9
View File
@@ -16,7 +16,6 @@
var/heat_resistance = 800
var/health = 70
var/maxhealth = 70
layer = BELOW_MOB_LAYER
resistance_flags = ACID_PROOF
@@ -165,14 +164,6 @@
usr.visible_message("<span class='warning'>[user] climbed over \the [src]!</span>")
usr.do_twist(targetangle = 45, timer = 8)
/obj/structure/railing/Initialize(mapload) //mobs will show under the south railing sprite, thanks Cyanosis for helping with the fix
. = ..()
if(!mapload)
return
if(!(dir & SOUTH))
return
layer = ABOVE_MOB_LAYER
/obj/structure/railing/handrail
name = "handrail"
desc = "A waist high handrail, perhaps you could climb over it."
hyperstation/code/modules/arousal/arousalhud.dm
+96 -70
View File
@@ -11,15 +11,7 @@
for(var/obj/item/organ/genital/G in U.internal_organs)
if(!G.nochange)
if(!G.dontlist)
var/genital_visibility = "[G.name] <font color='green'>(Visible)</font>"
switch(G.mode)
if(GENITALS_HIDDEN)
genital_visibility = "[G.name] <font color='red'>(Hidden)</font>"
if(GENITALS_CLOTHES)
genital_visibility = "[G.name] <font color='yellow'>(Hidden by Clothes)</font>"
if(GENITALS_VISIBLE)
genital_visibility = "[G.name] <font color='green'>(Visible)</font>"
dat += "<a href='byond://?src=[REF(src)];hide[G.name]=1'>[genital_visibility]</a><BR>"
dat += "<a href='byond://?src=[REF(src)];hide[G.name]=1'>[G.mode == "hidden" ? "[G.name] <font color='red'>(Hidden)</font>" : (G.mode == "clothes" ? "[G.name] <font color='yellow'>(Hidden by Clothes)</font>" : (G.mode == "visable" ? "[G.name] <font color='green'>(Visable)</font>" : "[G.name] <font color='green'>(Visable)</font>"))]</a><BR>"
dat += {"<BR><B>Contexual Options</B><BR><HR>"}
var/obj/item/organ/genital/penis/P = user.getorganslot("penis")
@@ -53,17 +45,20 @@
if(Belly.inflatable)
dat += "<a href='byond://?src=[REF(src)];shrink_belly=1'>Deflate belly</A>"
dat += "(Shrink your belly down a size)<BR>"
if(user.pulling && !isnoncarbon(user.pulling)) // do not fuck animals
if(user.pulling)
dat += "<a href='byond://?src=[REF(src)];climaxover=1'>Climax over [user.pulling]</A>" //you can cum on objects if you really want...
dat += "(Orgasm over a person or object.)<BR>"
if(iscarbon(user.pulling))
dat += "<a href='byond://?src=[REF(src)];climaxwith=1'>Climax with [user.pulling]</A>"
dat += {"(Orgasm with another person.)<BR>"}
var/mob/living/carbon/human/H = user.pulling
if(H && H.breedable && P)
dat += "<a href='byond://?src=[REF(src)];impreg=1'>Impregnate [U.pulling] ([clamp(U.impregchance,0,100)]%)</A>"
dat += "(Climax inside another person, and attempt to knock them up.)<BR>"
if(isliving(user.pulling))
if(iscarbon(user.pulling))
dat += "<a href='byond://?src=[REF(src)];climaxwith=1'>Climax with [user.pulling]</A>"
dat += {"(Orgasm with another person.)<BR>"}
var/mob/living/carbon/human/H = user.pulling
if(H.breedable && P && H)
dat += "<a href='byond://?src=[REF(src)];impreg=1'>Impregnate [U.pulling] ([clamp(U.impregchance,0,100)]%)</A>"
dat += "(Climax inside another person, and attempt to knock them up.)<BR>"
else
dat += "<span class='linkOff'>Climax over</span></A>"
dat += "(Requires a partner)<BR>"
@@ -86,9 +81,11 @@
dat += "<a href='byond://?src=[REF(src)];omenu=1'>Old Menu</A>"
dat += "<a href='byond://?src=[REF(src)];underwear=1'>Toggle Undergarments </A>"
dat += "<BR>"
var/datum/browser/popup = new(user, "arousal", "Arousal Panel")
popup.set_content(dat)
popup.set_title_image(user.browse_rsc_icon(icon, icon_state), 500,600)
popup.open()
@@ -143,7 +140,7 @@
T.toggle_visibility(picked_visibility)
if(href_list["masturbate"])
if (H.isPercentAroused(33)) //requires 33% arousal.
if (H.arousalloss >= (H.max_arousal / 100) * 33) //requires 33% arousal.
H.solomasturbate()
return
else
@@ -151,7 +148,7 @@
return
if(href_list["container"])
if (H.isPercentAroused(33)) //requires 33% arousal.
if (H.arousalloss >= (H.max_arousal / 100) * 33) //requires 33% arousal.
H.cumcontainer()
return
else
@@ -159,7 +156,7 @@
return
if(href_list["clothesplosion"])
if (H.isPercentAroused(33)) //Requires 33% arousal.
if (H.arousalloss >= (H.max_arousal / 100) * 33) //Requires 33% arousal.
H.clothesplosion()
return
else
@@ -167,7 +164,7 @@
return
if(href_list["climaxself"])
if (H.isPercentAroused(33)) //requires 33% arousal.
if (H.arousalloss >= (H.max_arousal / 100) * 33) //requires 33% arousal.
H.climaxself()
return
else
@@ -175,7 +172,7 @@
return
if(href_list["climax"])
if (H.isPercentAroused(33)) //requires 33% arousal.
if (H.arousalloss >= (H.max_arousal / 100) * 33) //requires 33% arousal.
H.climaxalone(FALSE)
return
else
@@ -183,7 +180,7 @@
return
if(href_list["climaxover"])
if (H.isPercentAroused(33)) //requires 33% arousal.
if (H.arousalloss >= (H.max_arousal / 100) * 33) //requires 33% arousal.
H.climaxover(usr.pulling)
return
else
@@ -191,7 +188,7 @@
return
if(href_list["climaxwith"])
if (H.isPercentAroused(33)) //requires 33% arousal.
if (H.arousalloss >= (H.max_arousal / 100) * 33) //requires 33% arousal.
H.climaxwith(usr.pulling)
return
else
@@ -199,7 +196,7 @@
return
if(href_list["impreg"])
if (H.isPercentAroused(33)) //requires 33% arousal.
if (H.arousalloss >= (H.max_arousal / 100) * 33) //requires 33% arousal.
H.impregwith(usr.pulling)
return
else
@@ -334,7 +331,7 @@ obj/screen/arousal/proc/kiss()
return
//We got hands, let's pick an organ
var/obj/item/organ/genital/picked_organ
picked_organ = pick_climax_genitals(masturbation=TRUE, title="Masturbation")
picked_organ = pick_masturbate_genitals()
if(picked_organ)
src << browse(null, "window=arousal") //closes the window
mob_masturbate(picked_organ)
@@ -368,31 +365,55 @@ obj/screen/arousal/proc/kiss()
to_chat(src, "<span class='warning'>You cannot climax without choosing genitals.</span>")
return
/mob/living/carbon/human/proc/climaxwith(mob/living/carbon/human/partner)
if(!partner)
to_chat(src, "<span class='warning'>You cannot do this alone.</span>")
return
/mob/living/carbon/human/proc/climaxwith(mob/living/T)
var/mob/living/carbon/human/L = pick_partner()
var/obj/item/organ/genital/picked_organ
picked_organ = pick_climax_genitals()
if(!picked_organ)
if(picked_organ)
var/mob/living/partner = L
if(partner)
src << browse(null, "window=arousal") //alls fine, we can close the window now.
var/obj/item/organ/genital/penis/P = picked_organ
var/spillage = "No" //default to no, just incase player has items on to prevent climax
if(!P.condom == 1&&!P.sounding == 1) //you cant climax with a condom on or sounding in.
spillage = input(src, "Would your fluids spill outside?", "Choose overflowing option", "Yes") as anything in list("Yes", "No")
if(spillage == "Yes")
mob_climax_partner(picked_organ, partner, TRUE, FALSE, FALSE)
else
mob_climax_partner(picked_organ, partner, FALSE, FALSE, FALSE)
else
to_chat(src, "<span class='warning'>You cannot do this alone.</span>")
return
else //They either lack organs that can masturbate, or they didn't pick one.
to_chat(src, "<span class='warning'>You cannot climax without choosing genitals.</span>")
return
src << browse(null, "window=arousal") // close arousal window
mob_climax_inside_spillage(picked_organ, partner, impreg=FALSE)
/mob/living/carbon/human/proc/climaxover(atom/partner)
/mob/living/carbon/human/proc/climaxover(mob/living/T)
var/mob/living/carbon/human/L = T
var/obj/item/organ/genital/picked_organ
picked_organ = pick_climax_genitals()
if(!picked_organ)
if(picked_organ)
src << browse(null, "window=arousal") //alls fine, we can close the window now.
var/mob/living/partner = L
if(partner)
var/obj/item/organ/genital/penis/P = picked_organ
if(P.condom == 1)
to_chat(src, "<span class='warning'>You cannot do this action with a condom on.</span>")
return
if(P.sounding == 1)
to_chat(src, "<span class='warning'>You cannot do this action with a sounding in.</span>")
return
mob_climax_partner(picked_organ, partner, FALSE, FALSE, TRUE)
else
to_chat(src, "<span class='warning'>You cannot do this alone.</span>")
return
else //They either lack organs that can masturbate, or they didn't pick one.
to_chat(src, "<span class='warning'>You cannot climax without choosing genitals.</span>")
return
src << browse(null, "window=arousal") //alls fine, we can close the window now.
if(!partner || isnoncarbon(partner))
to_chat(src, "<span class='warning'>You cannot do this alone.</span>")
return
mob_climax_cover(picked_organ, partner)
/mob/living/carbon/human/proc/clothesplosion()
if(usr.restrained(TRUE))
@@ -407,29 +428,39 @@ obj/screen/arousal/proc/kiss()
H.visible_message("<span class='boldnotice'>[H] explodes out of their clothes!'</span>")
/mob/living/carbon/human/proc/impregwith(mob/living/carbon/T)
var/mob/living/carbon/human/partner = pick_partner()
var/obj/item/organ/genital/penis/picked_organ = src.getorganslot("penis")
// wow that is a lot of conditionals huh
if(!picked_organ) // no penis :(
to_chat(src, "<span class='warning'>You cannot impregnate someone without a penis.</span>")
return
if(!partner)
to_chat(src, "<span class='warning'>You cannot do this alone.</span>")
return
if(!partner.breedable) //check if impregable.
to_chat(src, "<span class='warning'>Your partner cannot be impregnated.</span>")
//some fuckery happening, you shouldnt even get to this point tbh.
return
if(picked_organ.condom)
to_chat(src, "<span class='warning'>You cannot impregnate someone with a condom on.</span>")
return
if(picked_organ.sounding)
to_chat(src, "<span class='warning'>You cannot impregnate someone with a sounding rod in.</span>")
return
src << browse(null, "window=arousal") //alls fine, we can close the window now.
mob_climax_inside_spillage(picked_organ, partner, impreg=TRUE)
/mob/living/carbon/human/proc/impregwith(mob/living/T)
var/mob/living/carbon/human/L = pick_partner()
var/obj/item/organ/genital/picked_organ
picked_organ = src.getorganslot("penis") //Impregnation must be done with a penis.
if(picked_organ)
var/mob/living/partner = L
if(partner)
if(!partner.breedable)//check if impregable.
to_chat(src, "<span class='warning'>Your partner cannot be impregnated.</span>")//some fuckary happening, you shouldnt even get to this point tbh.
return
var/obj/item/organ/genital/penis/P = picked_organ
//you cant impreg with a condom on or sounding in.
if(P.condom == 1)
to_chat(src, "<span class='warning'>You cannot do this action with a condom on.</span>")
return
if(P.sounding == 1)
to_chat(src, "<span class='warning'>You cannot do this action with a sounding in.</span>")
return
src << browse(null, "window=arousal") //alls fine, we can close the window now.
//Keeping this for messy fun
var/spillage = input(src, "Would your fluids spill outside?", "Choose overflowing option", "Yes") as anything in list("Yes", "No")
if(spillage == "Yes")
mob_climax_partner(picked_organ, partner, TRUE, TRUE, FALSE)
else
mob_climax_partner(picked_organ, partner, FALSE, TRUE, FALSE)
else
to_chat(src, "<span class='warning'>You cannot do this alone.</span>")
return
else //no penis :(
to_chat(src, "<span class='warning'>You cannot impregnate without a penis.</span>")
return
/mob/living/carbon/human/proc/cumcontainer(mob/living/T)
//We'll need hands and no restraints.
@@ -469,11 +500,6 @@ obj/screen/arousal/proc/kiss()
cum_splatter_icon.Blend(icon('hyperstation/icons/effects/cumoverlay.dmi', "cum_obj"), ICON_MULTIPLY)
add_overlay(cum_splatter_icon)
/mob/living/carbon/add_cum_overlay(type="normal")
var/mutable_appearance/cumoverlay = mutable_appearance('hyperstation/icons/effects/cumoverlay.dmi')
cumoverlay.icon_state = "cum_[type]"
add_overlay(cumoverlay)
/atom/proc/wash_cum()
cut_overlay(mutable_appearance('hyperstation/icons/effects/cumoverlay.dmi', "cum_normal"))
cut_overlay(mutable_appearance('hyperstation/icons/effects/cumoverlay.dmi', "cum_large"))
@@ -497,7 +523,7 @@ obj/screen/arousal/proc/kiss()
return
//We got hands, let's pick an organ
var/obj/item/organ/genital/picked_organ
picked_organ = pick_climax_genitals(masturbation=TRUE, title="Masturbation")
picked_organ = pick_masturbate_genitals()
if(picked_organ)
src << browse(null, "window=arousal") //closes the window
mob_masturbate(picked_organ, cover = TRUE)
hyperstation/code/modules/arousal/organs/genitals.dm
-6
View File
@@ -1,6 +0,0 @@
/obj/item/organ/genital/proc/get_fluid_source()
if(producing)
return src.reagents
if(linked_organ && linked_organ.producing)
return linked_organ.reagents
return null
hyperstation/code/modules/cargo/packs/misc.dm
-28
View File
@@ -5,31 +5,3 @@
contains = list(/obj/item/polepack/,
/obj/item/wrench/)
crate_name = "stripper pole crate"
/datum/supply_pack/organic/donkpockets
name = "Donkpocket Shipment"
desc = "We at Donk corp provide a wide five selection of holovid ready dinner pockets for all your dietary needs from extra-cheese to vegan to even mothpeople. Product of Donk co."
cost = 1500
contains = list()
crate_name = "Donk Crate"
crate_type = /obj/structure/closet/crate/freezer
var/num_contained = 5
//Put the types you want to contain inside this list below.
var/can_contain = list( /obj/item/storage/box/donkpockets,
/obj/item/storage/box/donkpockets/donkpockettaco,
/obj/item/storage/box/donkpockets/donkpocketplasma,
/obj/item/storage/box/donkpockets/donkpocketbreakfast,
/obj/item/storage/box/donkpockets/donkpocketmoth,
/obj/item/storage/box/donkpockets/donkpocketvegan,
/obj/item/storage/box/donkpockets/donkpocketspicy,
/obj/item/storage/box/donkpockets/donkpocketteriyaki,
/obj/item/storage/box/donkpockets/donkpocketpizza,
/obj/item/storage/box/donkpockets/donkpocketberry,
/obj/item/storage/box/donkpockets/donkpockethonk
)
/datum/supply_pack/organic/donkpockets/fill(obj/structure/closet/crate/C)
contains = list()
for(var/i = 0; i < num_contained; i++)
contains += pick(can_contain)
. = ..()
hyperstation/code/modules/client/hyper_pref_savefile.dm
-36
View File
@@ -1,36 +0,0 @@
/datum/preferences/proc/hyper_character_pref_load(savefile/S)
S["feature_cosmetic_head"] >> features["cosmetic_head"]
S["feature_cosmetic_chest"] >> features["cosmetic_chest"]
S["feature_cosmetic_l_arm"] >> features["cosmetic_l_arm"]
S["feature_cosmetic_r_arm"] >> features["cosmetic_r_arm"]
S["feature_cosmetic_l_leg"] >> features["cosmetic_l_leg"]
S["feature_cosmetic_r_leg"] >> features["cosmetic_r_leg"]
S["cosmetic_markings"] >> features["cosmetic_markings"]
var/cosmetic_head = sanitize_inlist(features["cosmetic_head"], GLOB.cosmetic_heads, "default")
var/cosmetic_chest = sanitize_inlist(features["cosmetic_chest"], GLOB.cosmetic_chests, "default")
var/cosmetic_l_arm = sanitize_inlist(features["cosmetic_l_arm"], GLOB.cosmetic_arms, "default")
var/cosmetic_r_arm = sanitize_inlist(features["cosmetic_r_arm"], GLOB.cosmetic_arms, "default")
var/cosmetic_l_leg = sanitize_inlist(features["cosmetic_l_leg"], GLOB.cosmetic_legs, "default")
var/cosmetic_r_leg = sanitize_inlist(features["cosmetic_r_leg"], GLOB.cosmetic_legs, "default")
features["cosmetic_head"] = GLOB.cosmetic_heads[cosmetic_head]
features["cosmetic_chest"] = GLOB.cosmetic_chests[cosmetic_chest]
features["cosmetic_l_arm"] = GLOB.cosmetic_arms[cosmetic_l_arm]
features["cosmetic_r_arm"] = GLOB.cosmetic_arms[cosmetic_r_arm]
features["cosmetic_l_leg"] = GLOB.cosmetic_legs[cosmetic_l_leg]
features["cosmetic_r_leg"] = GLOB.cosmetic_legs[cosmetic_r_leg]
/datum/preferences/proc/hyper_character_pref_save(savefile/S)
var/datum/cosmetic_part/head = features["cosmetic_head"]
var/datum/cosmetic_part/chest = features["cosmetic_chest"]
var/datum/cosmetic_part/l_arm = features["cosmetic_l_arm"]
var/datum/cosmetic_part/r_arm = features["cosmetic_r_arm"]
var/datum/cosmetic_part/l_leg = features["cosmetic_l_leg"]
var/datum/cosmetic_part/r_leg = features["cosmetic_r_leg"]
WRITE_FILE(S["feature_cosmetic_head"], head.id)
WRITE_FILE(S["feature_cosmetic_chest"], chest.id)
WRITE_FILE(S["feature_cosmetic_l_arm"], l_arm.id)
WRITE_FILE(S["feature_cosmetic_r_arm"], r_arm.id)
WRITE_FILE(S["feature_cosmetic_l_leg"], l_leg.id)
WRITE_FILE(S["feature_cosmetic_r_leg"], r_leg.id)
WRITE_FILE(S["cosmetic_markings"], features["cosmetic_markings"])
hyperstation/code/modules/clothing/suits/misc.dm
+1 -40
View File
@@ -21,43 +21,4 @@
name = "\improper Hellraider's Vest"
desc = "An open leather vest with battlescarred metal shoulderpads, discovered in a dimensional anomaly. Smells of gunpowder and plasma."
icon_state = "guncaster_alt"
item_state = "guncaster_alt"
/*
* Posshim's Corpus atire
*/
//Making this a subset of wintercoats/winterhoods since poss intends it to have wintercoat stats --Archie
/obj/item/clothing/suit/hooded/wintercoat/corpus
name = "Standard Voidsuit"
desc = "Standard issue voidsuit in the name of Grofit!"
icon_state = "corpus"
item_state = "armor"
body_parts_covered = CHEST|GROIN|LEGS|ARMS|FEET|HANDS
hoodtype = /obj/item/clothing/head/hooded/winterhood/corpus
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT //"Hide shoes" but digi shoes dont get hidden, too bad!
mutantrace_variation = NO_MUTANTRACE_VARIATION //There is no need for a digi variant, it's a costume
/obj/item/clothing/suit/hooded/wintercoat/corpus/sec
name = "Enforcer Voidsuit"
desc = "Delux issue grofit voidsuit. Let the middle class know You're in charge."
icon_state = "corpuss"
hoodtype = /obj/item/clothing/head/hooded/winterhood/corpus/sec //Enjoy this nice red outfit Kinaris! There is NO NEED for a pink one! xoxo -VivI Fanteriso
/obj/item/clothing/suit/hooded/wintercoat/corpus/command
name = "Commander Voidsuit"
desc = "Premium issue correctional worker attire. Grease the gears of production."
icon_state = "corpusc"
hoodtype = /obj/item/clothing/head/hooded/winterhood/corpus/command
/obj/item/clothing/head/hooded/winterhood/corpus
name = "Voidsuit helmet"
desc = "galvanized reinforced helm to protect against the elements"
icon_state = "corpus"
flags_inv = HIDEHAIR|HIDEEARS|HIDEFACIALHAIR|HIDEFACE|HIDEMASK|HIDESNOUT|HIDENECK //hide your ugly face with this one simple trick!
/obj/item/clothing/head/hooded/winterhood/corpus/sec
icon_state = "corpuss"
/obj/item/clothing/head/hooded/winterhood/corpus/command
icon_state = "corpusc"
item_state = "guncaster_alt"
hyperstation/code/modules/mob/dead/new_player/cosmetic_parts.dm
-154
View File
@@ -1,154 +0,0 @@
/*
COSMETIC PARTS
this system allows you to change the _base_ appearance of a limb independent
of species or markings. this, for example, allows us to create "hybrids" like a
mammal with avian legs.
keep in mind that this does not change the species of a leg! in the above example,
the mammal's bird-legs are still mammal legs. this matters in some places, like
body part transplants; mis-matched species will cause extra damage if the surgery
fails and the part is rejected. so you can't attach mammal-bird legs to avians
safely.
*/
/datum/cosmetic_part
/** A unique string that is used to identify this part for save files. Allows name changes without breaking saves */
var/id
/** The name of the cosmetic part. This shows up in the preferences dropdown. */
var/name
var/icon = 'hyperstation/icons/mob/char_parts.dmi'
var/icon_state
/** How colors are determined for this part. MUTCOLORS for base color, MATRIXED to allow multiple channels. */
var/color_src = MUTCOLORS
/** Whether or not this cosmetic part has an alternate form for digitigrade legs. */
var/support_digitigrade = TRUE
/** Species IDs that support this cosmetic part. Bypassed with "show mismatched markings" option. */
var/list/supported_species
/datum/cosmetic_part/head
/datum/cosmetic_part/chest
/datum/cosmetic_part/arms
/datum/cosmetic_part/legs
// HEADS
// =========================================
/datum/cosmetic_part/head/default
id = "default"
name = "default"
icon = null
/datum/cosmetic_part/head/ipc_round
id = "ipc_round"
name = "round ipc head"
icon_state = "ipc_round"
supported_species = list("ipc")
// CHESTS
// =========================================
/datum/cosmetic_part/chest/default
id = "default"
name = "default"
icon = null
/datum/cosmetic_part/chest/ipc_sleek
id = "ipc_sleek"
name = "sleek ipc chest"
icon_state = "ipc_sleek"
supported_species = list("ipc")
color_src = MATRIXED
/datum/cosmetic_part/chest/ipc_jointed
id = "ipc_jointed"
name = "jointed ipc chest"
icon_state = "ipc_jointed"
supported_species = list("ipc")
color_src = MATRIXED
// ARMS
// =========================================
/datum/cosmetic_part/arms/default
id = "default"
name = "default"
icon = null
/datum/cosmetic_part/arms/avian_alt
id = "avian_alt"
name = "avian claws"
icon_state = "avian_alt"
supported_species = list("mammal", "avian", "aquatic", "insect", "xeno", "synthliz")
/datum/cosmetic_part/arms/insect
id = "insect"
name = "insect arms"
icon = 'modular_citadel/icons/mob/mutant_bodyparts.dmi'
icon_state = "insect"
supported_species = list("mammal", "avian", "aquatic", "insect", "xeno", "synthliz")
/datum/cosmetic_part/arms/ipc_sleek
id = "ipc_sleek"
name = "sleek ipc arms"
icon_state = "ipc_sleek"
supported_species = list("ipc")
color_src = MATRIXED
/datum/cosmetic_part/arms/ipc_jointed
id = "ipc_jointed"
name = "jointed ipc arms"
icon_state = "ipc_jointed"
supported_species = list("ipc")
color_src = MATRIXED
// LEGS
// =========================================
/datum/cosmetic_part/legs/default
id = "default"
name = "default"
icon = null
/datum/cosmetic_part/legs/avian
id = "avian"
name = "avian legs"
icon = 'modular_citadel/icons/mob/mutant_bodyparts.dmi'
icon_state = "avian"
supported_species = list("mammal", "avian", "aquatic", "insect", "xeno", "synthliz")
support_digitigrade = FALSE
/datum/cosmetic_part/legs/mammal
id = "mammal"
name = "mammal legs"
icon = 'modular_citadel/icons/mob/mutant_bodyparts.dmi'
icon_state = "mammal"
supported_species = list("mammal", "avian", "aquatic", "insect", "xeno", "synthliz")
support_digitigrade = TRUE
/datum/cosmetic_part/legs/insect
id = "insect"
name = "insect legs"
icon = 'modular_citadel/icons/mob/mutant_bodyparts.dmi'
icon_state = "insect"
supported_species = list("mammal", "avian", "aquatic", "insect", "xeno", "synthliz")
support_digitigrade = TRUE
/datum/cosmetic_part/legs/ipc_sleek
id = "ipc_sleek"
name = "sleek ipc legs"
icon_state = "ipc_sleek"
supported_species = list("ipc")
color_src = MATRIXED
support_digitigrade = FALSE
/datum/cosmetic_part/legs/ipc_jointed
id = "ipc_jointed"
name = "jointed ipc legs"
icon_state = "ipc_jointed"
supported_species = list("ipc")
color_src = MATRIXED
support_digitigrade = FALSE
hyperstation/code/modules/mob/dead/new_player/sprite_accessories.dm
+1 -121
View File
@@ -87,11 +87,6 @@ SNOUTS
icon_state = "feasterndnw"
icon = 'hyperstation/icons/mob/char_snouts.dmi'
/datum/sprite_accessory/mam_snouts/knshuttle // Dahlular and Arcstaisia @ hyperstation, april 2022. Feel free to remove comment. Just remember this is snowflakey Kinaris stuff.
name = "Kinaris - Shuttle (Hyper)"
icon_state = "knshuttle"
icon = 'hyperstation/icons/mob/char_snouts.dmi'
/datum/sprite_accessory/mam_snouts/fchemlight
name = "RadDog (Top) (Hyper)"
icon_state = "fchemlight"
@@ -148,11 +143,6 @@ EARS
icon_state = "easternd"
icon = 'hyperstation/icons/mob/char_ears.dmi'
/datum/sprite_accessory/mam_ears/knshuttle // Dahlular and Arcstaisia @ hyperstation, april 2022. Feel free to remove comment. Just remember this is snowflakey Kinaris stuff.
name = "Kinaris - Shuttle (Hyper)"
icon_state = "knshuttle"
icon = 'hyperstation/icons/mob/char_ears.dmi'
/datum/sprite_accessory/mam_ears/chemlight
name = "RadDog (Hyper)"
icon_state = "chemlight"
@@ -195,13 +185,6 @@ WINGS
icon_state = "insect"
icon = 'hyperstation/icons/mob/char_wings.dmi'
/datum/sprite_accessory/deco_wings/knshuttle // Dahlular and Arcstaisia @ hyperstation, april 2022. Feel free to remove comment. Just remember this is snowflakey Kinaris stuff.
name = "Kinaris - Shuttle (Hyper)"
icon_state = "knshuttle"
icon = 'hyperstation/icons/mob/char_wings.dmi'
//recommended_species = list("synthliz") need to give synths a deco wing slot
color_src = MATRIXED
/datum/sprite_accessory/deco_wings/minibat // sarcoph @ hyperstation, march 2022
name = "Mini Bat (Hyper)"
icon_state = "minibat"
@@ -341,18 +324,6 @@ TAILS + ANIMATED TAILS
icon_state = "easternd"
icon = 'hyperstation/icons/mob/char_tails.dmi'
/datum/sprite_accessory/mam_tails/knshuttle // Dahlular and Arcstaisia @ hyperstation, april 2022. Feel free to remove comment. Just remember this is snowflakey Kinaris stuff.
name = "Kinaris - Shuttle (Hyper)"
icon_state = "knshuttle"
icon = 'hyperstation/icons/mob/char_tails.dmi'
recommended_species = list("synthliz")
/datum/sprite_accessory/mam_tails_animated/knshuttle
name = "Kinaris - Shuttle (Hyper)"
icon_state = "knshuttle"
icon = 'hyperstation/icons/mob/char_tails.dmi'
recommended_species = list("synthliz")
/datum/sprite_accessory/mam_tails/chemlight
name = "RadDog (Hyper)"
icon_state = "chemlight"
@@ -427,11 +398,6 @@ from modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm:
icon_state = "easternd"
icon = 'hyperstation/icons/mob/char_markings.dmi'
/datum/sprite_accessory/mam_body_markings/knshuttle // Dahlular and Arcstaisia @ hyperstation, april 2022. Feel free to remove comment. Just remember this is snowflakey Kinaris stuff.
name = "Kinaris - Shuttle (Hyper)"
icon_state = "knshuttle"
icon = 'hyperstation/icons/mob/char_markings.dmi'
//doged was here
/datum/sprite_accessory/mam_body_markings/chemlight
name = "RadDog (Hyper)"
@@ -475,92 +441,6 @@ from modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm:
taur_mode = PAW_TAURIC
ckeys_allowed = list("chemlight")
/*
IPCS
==========================================================
*/
/*
from modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm:
/datum/sprite_accessory/antenna
icon = 'modular_citadel/icons/mob/ipc_antennas.dmi'
color_src = MUTCOLORS3
recommended_species = list("ipc")
/datum/sprite_accessory/screen
icon = 'modular_citadel/icons/mob/ipc_screens.dmi'
color_src = null
*/
/datum/sprite_accessory/antenna/idog_down
name = "Dog, down (Hyper)"
icon_state = "idog_down"
color_src = MATRIXED
/datum/sprite_accessory/antenna/idog_up
name = "Dog, up (Hyper)"
icon_state = "idog_up"
color_src = MATRIXED
/datum/sprite_accessory/antenna/headset
name = "Headphones (Hyper)"
icon_state = "headset"
color_src = MATRIXED
/datum/sprite_accessory/antenna/aquatic
name = "Fins (Hyper)"
icon_state = "aquatic"
color_src = MATRIXED
/datum/sprite_accessory/screen/ghost
name = "Ghost (Hyper)"
icon_state = "ghost"
/datum/sprite_accessory/screen/heartbeat
name = "Heartbeat (Hyper)"
icon_state = "heartbeat"
/datum/sprite_accessory/screen/ocean
name = "Ocean (Hyper)"
icon_state = "ocean"
/datum/sprite_accessory/antenna/catears
name = "Pointy Ears (Hyper)"
icon_state = "catears"
color_src = MATRIXED
/datum/sprite_accessory/screen/valley
name = "Valley (Hyper)"
icon_state = "valley"
/datum/sprite_accessory/screen/visor
name = "Black Visor (Hyper)"
icon = 'hyperstation/icons/mob/ipc_screen_visor.dmi'
icon_state = "visor_black"
/datum/sprite_accessory/screen/visor/blue
name = "Blue Visor (Hyper)"
icon_state = "visor_blue"
/datum/sprite_accessory/screen/visor/green
name = "Green Visor (Hyper)"
icon_state = "visor_green"
/datum/sprite_accessory/screen/visor/red
name = "Red Visor (Hyper)"
icon_state = "visor_red"
/datum/sprite_accessory/screen/visor/white
name = "White Visor (Hyper)"
icon_state = "visor_white"
/datum/sprite_accessory/screen/visor/yellow
name = "Yellow Visor (Hyper)"
icon_state = "visor_yellow"
/*
HAIRSTYLES
==========================================================
@@ -600,4 +480,4 @@ from code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm:
/datum/sprite_accessory/hair/emoh
name = "Emo (Hyper)"
icon_state = "hair_emoh"
icon_state = "hair_emoh"
hyperstation/code/modules/mob/living/carbon/carbon.dm
-5
View File
@@ -13,11 +13,6 @@
/mob/living/carbon/handle_status_effects()
..()
handle_pain()
/mob/living/carbon/has_mouth()
var/obj/item/bodypart/head/head = get_bodypart(BODY_ZONE_HEAD)
if(head && head.mouth)
return TRUE
/mob/living/carbon/proc/handle_pain()
var/pain_amount = 0
hyperstation/code/modules/mob/living/carbon/human/cosmetic_part_handler.dm
-17
View File
@@ -1,17 +0,0 @@
/obj/item/bodypart/proc/apply_cosmetic(datum/cosmetic_part/part)
if(!is_organic_limb() || animal_origin || !part)
return
cosmetic_icon = part
/mob/living/carbon/human/proc/handle_cosmetic_parts()
var/features = dna.features
var/list/body_zones = list(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
for(var/zone in body_zones)
var/datum/cosmetic_part/cosmetic_pref = features["cosmetic_" + zone]
if(!istype(cosmetic_pref, /datum/cosmetic_part))
continue
var/datum/cosmetic_part/part = cosmetic_pref
var/obj/item/bodypart/body_part = get_bodypart(zone)
if(body_part && part)
body_part.apply_cosmetic(part)
hyperstation/code/modules/mob/living/carbon/human/species_types/ipc.dm
-58
View File
@@ -1,58 +0,0 @@
// APC powercord: oracle port
/obj/item/apc_powercord
name = "power cord"
desc = "An internal power cord hooked up to a battery. Useful if you run on electricity. Not so much otherwise."
icon = 'icons/obj/power.dmi'
icon_state = "wire1"
/obj/item/apc_powercord/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
if(!istype(target, /obj/machinery/power/apc) || !ishuman(user) || !proximity_flag)
return ..()
user.changeNext_move(CLICK_CD_MELEE)
var/mob/living/carbon/human/H = user
var/obj/item/organ/stomach/cell/battery = H.getorganslot(ORGAN_SLOT_STOMACH)
if(!battery)
to_chat(H, "<span class='warning'>You try to siphon energy from \the [target], but your power cell is gone!</span>")
return
if(istype(H) && H.nutrition >= NUTRITION_LEVEL_ALMOST_FULL)
to_chat(user, "<span class='warning'>You are already fully charged!</span>")
return
if(istype(target, /obj/machinery/power/apc))
var/obj/machinery/power/apc/A = target
if(A.cell && A.cell.charge > A.cell.maxcharge*0.25)
powerdraw_loop(A, H)
return
else
to_chat(user, "<span class='warning'>There is not enough charge to draw from that APC.</span>")
return
/obj/item/apc_powercord/proc/powerdraw_loop(obj/machinery/power/apc/A, mob/living/carbon/human/H)
H.visible_message("<span class='notice'>[H] inserts a power connector into the [A].</span>", "<span class='notice'>You begin to draw power from the [A].</span>")
while(do_after(H, 10, target = A))
if(!istype(A))
return
if(loc != H)
to_chat(H, "<span class='warning'>You must keep your connector out while charging!</span>")
break
if(A.cell.charge == 0)
to_chat(H, "<span class='warning'>The [A] doesn't have enough charge to spare.</span>")
break
A.charging = 1
if(A.cell.charge >= 500)
H.nutrition += 50
A.cell.charge -= 250
to_chat(H, "<span class='notice'>You siphon off some of the stored charge for your own use.</span>")
else
H.nutrition += A.cell.charge/10
A.cell.charge = 0
to_chat(H, "<span class='notice'>You siphon off as much as the [A] can spare.</span>")
break
if(H.nutrition > NUTRITION_LEVEL_WELL_FED)
to_chat(H, "<span class='notice'>You are now fully charged.</span>")
break
H.visible_message("<span class='notice'>[H] unplugs from the [A].</span>", "<span class='notice'>You unplug from the [A].</span>")
hyperstation/code/modules/mob/living/silicon/robot/examine_vr.dm
-8
View File
@@ -1,8 +0,0 @@
/mob/living/silicon/robot/proc/examine_bellies_borg()
var/message = ""
for(var/belly in vore_organs)
var/obj/belly/B = belly
message += B.get_examine_msg()
return message
hyperstation/code/modules/mob/living/silicon/robot/robot.dm
+1 -1
View File
@@ -1,3 +1,3 @@
//This file is empty right now, but leaves room for people to put shit here in the future for those who are lazy
/mob/living/silicon/robot
var/datum/action/cyborg_small_sprite/small_sprite_action //This gets replaced every time the cyborg changes modules --Cyanosis
var/datum/action/cyborg_small_sprite/small_sprite_action //This gets replaced every time the cyborg changes modules --Cyanosis
hyperstation/code/modules/mob/living/silicon/robot/robot_modules.dm
+1 -50
View File
@@ -1,60 +1,11 @@
//This file is empty right now, but leaves room for people to put shit here in the future for those who are lazy
/obj/item/robot_module
var/list/added_channels = list() //Borg radio stuffs
//service
/obj/item/robot_module/butler
added_channels = list(RADIO_CHANNEL_SERVICE = 1)
/obj/item/robot_module/clown
added_channels = list(RADIO_CHANNEL_SERVICE = 1)
/obj/item/robot_module/janitor
added_channels = list(RADIO_CHANNEL_SERVICE = 1)
//engineering
/obj/item/robot_module/engineering
added_channels = list(RADIO_CHANNEL_ENGINEERING = 1)
//medical
/obj/item/robot_module/medical
added_channels = list(RADIO_CHANNEL_MEDICAL = 1)
//security
/obj/item/robot_module/peacekeeper
added_channels = list(RADIO_CHANNEL_SECURITY = 1)
/obj/item/robot_module/security
added_channels = list(RADIO_CHANNEL_SECURITY = 1)
//supply
/obj/item/robot_module/miner
added_channels = list(RADIO_CHANNEL_SUPPLY = 1) // Probably already handled by other code when spawned with pre-set module, but whatever.
//dogborgs
/obj/item/robot_module/k9
added_channels = list(RADIO_CHANNEL_SECURITY = 1)
/obj/item/robot_module/medihound
added_channels = list(RADIO_CHANNEL_MEDICAL = 1)
/obj/item/robot_module/scrubpup
added_channels = list(RADIO_CHANNEL_SERVICE = 1)
/obj/item/robot_module/borgi
added_channels = list(RADIO_CHANNEL_SERVICE = 1)
/obj/item/robot_module/orepup
added_channels = list(RADIO_CHANNEL_SUPPLY = 1)
//This proc gets called whenever a new robot module is being applied --Cyanosis
/obj/item/robot_module/proc/handle_sprite_action(mob/living/silicon/robot/R, is_huge = FALSE)
ASSERT(istype(R))
if(R.small_sprite_action)
QDEL_NULL(R.small_sprite_action)
if(!is_huge) //only from the expander upgrade. The borg won't have an action if they don't have the expander upgrade
if(!is_huge) //only from the expander upgrade. The borg won't have an action if they don't have the expander upgrade
return
for(var/P in typesof(/datum/action/cyborg_small_sprite))
var/datum/action/cyborg_small_sprite/action = P
hyperstation/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+1 -1
View File
@@ -241,6 +241,6 @@
/mob/living/simple_animal/chicken/examine()
. = ..()
. += "<span class='notice'>This one is [gender].</span>"
. += "this one is [gender]."
if(happiness<20)
. += "<span class='warning'>It looks stressed.</span>"
hyperstation/code/modules/mob/mob_helpers.dm
-4
View File
@@ -27,7 +27,3 @@ mob/proc/checkloadappearance()
else
to_chat(H, "<span class='boldannounce'>You either took too long or chose not to change. Alrighty. Remember, you have 90 seconds from spawn to get to a mirror and still do it if you wish.</span>")
return
// oracle port
/mob/proc/has_mouth()
return FALSE
hyperstation/code/modules/research/designs/medical_designs.dm
-69
View File
@@ -1,69 +0,0 @@
/datum/design/ipc_liver
name = "IPC Reagent Processor"
id = "ipc_liver"
build_type = PROTOLATHE
materials = list(MAT_METAL = 2000, MAT_GLASS = 1000)
build_path = /obj/item/organ/liver/ipc
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
construction_time = 100
/datum/design/ipc_eyes
name = "IPC Eyes"
id = "ipc_eyes"
build_type = PROTOLATHE
materials = list(MAT_METAL = 1000, MAT_GLASS = 2000)
build_path = /obj/item/organ/eyes/ipc
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
construction_time = 100
/datum/design/ipc_tongue
name = "Positronic Voicebox"
id = "ipc_tongue"
build_type = PROTOLATHE
materials = list(MAT_METAL = 2000, MAT_GLASS = 1000)
build_path = /obj/item/organ/tongue/robot/ipc
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
construction_time = 100
/datum/design/ipc_stomach
name = "Micro-cell"
id = "ipc_stomach"
build_type = PROTOLATHE
materials = list(MAT_METAL = 2000, MAT_GLASS = 1000, MAT_PLASMA = 200)
build_path = /obj/item/organ/stomach/cell
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
construction_time = 100
/datum/design/synthliz_stomach
name = "Synthetic Lizardperson Stomach"
id = "synthliz_stomach"
build_type = PROTOLATHE
materials = list(MAT_METAL = 2000, MAT_GLASS = 1000)
build_path = /obj/item/organ/stomach/synthliz
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
construction_time = 100
/datum/design/power_cord
name = "IPC Power Cord"
id = "power_cord"
build_type = PROTOLATHE
materials = list(MAT_METAL = 2000, MAT_GLASS = 1000)
build_path = /obj/item/organ/cyberimp/arm/power_cord
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
construction_time = 100
/datum/techweb_node/ipc_organs
id = "ipc_organs"
display_name = "IPC Parts"
description = "We have the technology to replace him."
prereq_ids = list("cyber_organs","robotics")
design_ids = list("ipc_liver", "ipc_eyes", "ipc_tongue", "ipc_stomach", "synthliz_stomach", "power_cord")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1500)
export_price = 5000
hyperstation/code/modules/surgery/organs/augments_arms.dm
-8
View File
@@ -23,11 +23,3 @@
w_class = WEIGHT_CLASS_BULKY
sharpness = IS_SHARP_ACCURATE
attack_verb = list("slashed", "cut")
// oracle port
/obj/item/organ/cyberimp/arm/power_cord
name = "power cord implant"
desc = "An internal power cord hooked up to a battery. Useful if you run on volts."
contents = newlist(/obj/item/apc_powercord)
zone = "l_arm"
hyperstation/code/obj/condom.dm
+1
View File
@@ -115,6 +115,7 @@ obj/item/condom/update_icon()
return
if(!P.condom)
return
var/obj/item/condom/filled/C = new
P.linked_organ.reagents.trans_to(C, P.linked_organ.reagents.total_volume)
C.loc = loc
hyperstation/code/obj/farming/farming.dm
+2 -2
View File
@@ -1,5 +1,5 @@
/obj/item/reagent_containers/food/snacks/grown/wheat
var/stacktype = /obj/item/stack/tile/hay
/obj/item/reagent_containers/food/snacks/grown/wheat/
var stacktype = /obj/item/stack/tile/hay
var/tile_coefficient = 0.02 // same as grass
/obj/item/reagent_containers/food/snacks/grown/wheat/attack_self(mob/user)
hyperstation/code/obj/fleshlight.dm
+133 -92
View File
@@ -45,9 +45,11 @@
inuse = 1
if(!(C == user)) //if we are targeting someone else.
C.visible_message("<span class='userlove'>[user] is trying to use [src] on [C]'s penis.</span>", "<span class='userlove'>[user] is trying to use [src] on your penis.</span>")
if(!do_mob(user, C, 3 SECONDS)) //3 second delay
inuse = 0
return
//checked if not used on yourself, if not, carry on.
playsound(src, 'sound/lewd/slaps.ogg', 30, 1, -1) //slapping sound
inuse = 0
@@ -55,22 +57,27 @@
C.visible_message("<span class='userlove'>[user] pumps [src] on [C]'s penis.</span>", "<span class='userlove'>[user] pumps [src] up and down on your penis.</span>")
else
user.visible_message("<span class='userlove'>[user] pumps [src] on their penis.</span>", "<span class='userlove'>You pump the fleshlight on your penis.</span>")
if(prob(30)) //30% chance to make them moan.
C.emote("moan")
C.do_jitter_animation()
C.adjustArousalLoss(20) //make the target more aroused.
if(C.can_orgasm() && ishuman(C))
var/mob/living/carbon/human/user_human = C
user_human.mob_climax_outside(P, mb_time=0) // instant, because we already did a warmup
if (C.getArousalLoss() >= 100 && ishuman(C) && C.has_dna())
C.mob_climax(forced_climax=TRUE) //make them cum if they are over the edge.
return
else
to_chat(user, "<span class='notice'>You don't see anywhere to use this on.</span>")
inuse = 0
..()
//Hyperstation 13 portal fleshlight
//kinky!
/obj/item/portallight
name = "portal fleshlight"
desc = "A silver love(TM) fleshlight, used to stimulate someones penis, with bluespace tech that allows lovers to hump at a distance."
@@ -88,6 +95,7 @@
var/paired = 0
var/obj/item/portalunderwear
var/useable = FALSE
var/option = ""
/obj/item/portallight/examine(mob/user)
. = ..()
@@ -96,109 +104,136 @@
else
. += "<span class='notice'>The device is paired, and awaiting input. </span>"
/obj/item/portallight/attack(mob/living/carbon/user, mob/living/holder)
/obj/item/portallight/attack(mob/living/carbon/C, mob/living/user) //use portallight! nearly the same as the fleshlight apart from you have a buddy!
var/obj/item/organ/genital/penis/P = C.getorganslot("penis")
if(inuse) //just to stop stacking and causing people to cum instantly
return
if(!UpdateUsability())
to_chat(holder, "<span class='notice'>\The [src] appears to be currently unusable.</span>")
return
var/option = "Fuck"
if(user == holder)
if(!useable)
to_chat(user, "<span class='notice'>It seems the device has failed or your partner is not wearing their device.</span>")
if(C == user)//if your using it on yourself, more options! otherwise, just fuck.
option = input(usr, "Choose action", "Portal Fleshlight", "Fuck") in list("Fuck", "Lick", "Touch")
var/obj/item/organ/genital/target_genital = portalunderwear.loc
var/mob/living/carbon/human/target = target_genital.owner
var/obj/item/organ/genital/penis/P = user.getorganslot("penis")
if(option == "Fuck" && !P.is_exposed())
to_chat(holder, "<span class='notice'>You don't see anywhere to use this on.</span>")
else
option = "Fuck"
var/obj/item/organ/genital/G
if(istype(portalunderwear.loc, /obj/item/organ/genital)) //Sanity check. Without this it will runtime error.
G = portalunderwear.loc
if(!G)
return
/*
WARMUP START - prevents spam/instant climax
*/
inuse = TRUE
if(user != holder)
user.visible_message("<span class='userlove'>[holder] is trying to use [src] on [user]'s penis.</span>",\
"<span class='userlove'>[holder] is trying to use [src] on your penis.</span>")
if(!do_mob(holder, user, 3 SECONDS))
inuse = FALSE
var/mob/living/carbon/human/M = G.owner
if(option == "Fuck"&&!P.is_exposed()) //we are trying to fuck with no penis!
to_chat(user, "<span class='notice'>You don't see anywhere to use this on.</span>")
return
else //other options dont need checks
inuse = 1
if(!(C == user)) //if we are targeting someone else.
C.visible_message("<span class='userlove'>[user] is trying to use [src] on [C]'s penis.</span>", "<span class='userlove'>[user] is trying to use [src] on your penis.</span>")
if(!do_mob(user, C, 3 SECONDS)) //3 second delay
inuse = 0
return
//checked if not used on yourself, if not, carry on.
if(option == "Fuck")
playsound(src, 'sound/lewd/slaps.ogg', 30, 1, -1) //slapping sound for fuck.
inuse = 0
if(!(C == user))
C.visible_message("<span class='userlove'>[user] pumps [src] on [C]'s penis.</span>", "<span class='userlove'>[user] pumps [src] up and down on your penis.</span>")
else
if(option == "Fuck")
user.visible_message("<span class='userlove'>[user] pumps [src] on their penis.</span>", "<span class='userlove'>You pump the fleshlight on your penis.</span>")
if(option == "Lick")
user.visible_message("<span class='userlove'>[user] licks into [src].</span>", "<span class='userlove'>You lick into [src].</span>")
if(option == "Touch")
user.visible_message("<span class='userlove'>[user] touches softly against [src].</span>", "<span class='userlove'>You touch softly on [src].</span>")
if(prob(30)) //30% chance to make your partner moan.
M.emote("moan")
if(option == "Fuck")// normal fuck
to_chat(M, "<span class='love'>You feel a [P.length] inch, [P.shape] shaped penis pumping through the portal into your [G.name].</span>")//message your partner, and kinky!
if(prob(30)) //30% chance to make them moan.
C.emote("moan")
if(prob(30)) //30% chance to make your partner moan.
M.emote("moan")
C.adjustArousalLoss(20)
M.adjustArousalLoss(20)
M.do_jitter_animation() //make your partner shake too!
if (M.getArousalLoss() >= 100 && ishuman(M) && prob(5))//Why not have a probability to cum when someone's getting nailed with max arousal?~
if(G.is_exposed()) //Oh yea, if vagina is not exposed, the climax will not cause a spill
M.mob_climax_outside(G, spillage = TRUE)
else
M.mob_climax_outside(G, spillage = FALSE)
if (C.getArousalLoss() >= 100 && ishuman(C) && C.has_dna())
var/mob/living/carbon/human/O = C
if( (P.condom == 1) || (P.sounding == 1)) //If coundomed and/or sounded, do not fire impreg chance
O.mob_climax_partner(P, M, FALSE, FALSE, FALSE, TRUE)
else //Else, fire impreg chance
if(G.name == "vagina") //no more spontaneous impregnations through the butt!
O.mob_climax_partner(P, M, FALSE, TRUE, FALSE, TRUE)
else
O.mob_climax_partner(P, M, FALSE, FALSE, FALSE, TRUE)
if(option == "Lick")
to_chat(M, "<span class='love'>You feel a tongue lick you through the portal against your [G.name].</span>")
M.adjustArousalLoss(10)
if(option == "Touch")
to_chat(M, "<span class='love'>You feel someone touching your [G.name] through the portal.</span>")
M.adjustArousalLoss(5)
return
inuse = FALSE
/*
WARMUP END - proceed with the action
*/
switch(option)
if("Fuck")
playsound(src, 'sound/lewd/slaps.ogg', 30, 1, -1)
if(user == holder)
holder.visible_message("<span class='userlove'>[holder] pumps [src] on their penis.</span>",
"<span class='userlove'>You pump the fleshlight on your penis.</span>")
else
user.visible_message("<span class='userlove'>[holder] pumps [src] on [user]'s penis.</span>",\
"<span class='userlove'>[holder] pumps [src] up and down on your penis.</span>")
to_chat(target, "<span class='love'>You feel a [P.length] inch, [P.shape] shaped penis pumping through the portal into your [target_genital.name].</span>")
if(prob(30))
user.emote("moan")
user.adjustArousalLoss(20)
target.adjustArousalLoss(20)
target.do_jitter_animation()
if(target.can_orgasm() && prob(5))
target.mob_climax_outside(target_genital, spillage=target_genital.is_exposed())
if(user.can_orgasm())
var/mob/living/carbon/human/O = user
var/impreg_chance = target_genital.name == "vagina" && !P.condom && !P.sounding
if(O.mob_climax_in_partner(P, target, spillage=FALSE, remote=TRUE) && impreg_chance)
target.impregnate(by=O)
if("Lick")
holder.visible_message("<span class='userlove'>[holder] licks into [src].</span>",\
"<span class='userlove'>You lick into [src].</span>")
to_chat(target, "<span class='love'>You feel a tongue lick you through the portal against your [target_genital.name].</span>")
target.adjustArousalLoss(10)
if("Touch")
holder.visible_message("<span class='userlove'>[holder] touches softly against [src].</span>",\
"<span class='userlove'>You touch softly on [src].</span>")
to_chat(target, "<span class='love'>You feel someone touching your [target_genital.name] through the portal.</span>")
target.adjustArousalLoss(5)
if(prob(30))
target.emote("moan")
..()
/obj/item/portallight/proc/updatesleeve()
//get their looks and vagina colour!
cut_overlays()
if(!UpdateUsability())
cut_overlays()//remove current overlays
var/obj/item/organ/genital/G
if(istype(portalunderwear.loc, /obj/item/organ/genital)) //Sanity check. Without this it will runtime.
G = portalunderwear.loc
if(!G)
useable = FALSE
return
var/obj/item/organ/genital/G = portalunderwear.loc
var/mob/living/carbon/human/H = G.owner // H is verified by UpdateUsability()
var/sleeve_species = "normal"
switch(H.dna.species.name)
if("Lizardperson")
sleeve_species = "lizard"
if("Slimeperson")
sleeve_species = "slime"
if("Avian")
sleeve_species = "avian"
sleeve = mutable_appearance('hyperstation/icons/obj/fleshlight.dmi', "portal_sleeve_[sleeve_species]")
sleeve.color = "#" + H.dna.features["mcolor"]
add_overlay(sleeve)
if(G.name == "vagina")
organ = mutable_appearance('hyperstation/icons/obj/fleshlight.dmi', "portal_vag")
organ.color = portalunderwear.loc.color
if(G.name == "anus")
organ = mutable_appearance('hyperstation/icons/obj/fleshlight.dmi', "portal_anus")
organ.color = "#" + H.dna.features["mcolor"]
add_overlay(organ)
/obj/item/portallight/proc/UpdateUsability()
var/useable = FALSE
if(portalunderwear && istype(portalunderwear.loc, /obj/item/organ/genital))
var/obj/item/organ/genital/loc_genitals = portalunderwear.loc
if(loc_genitals.owner && ishuman(loc_genitals.owner))
useable = TRUE
src.useable = useable
return useable
var/mob/living/carbon/human/H = G.owner
if(H) //if the portal panties are on someone.
sleeve = mutable_appearance('hyperstation/icons/obj/fleshlight.dmi', "portal_sleeve_normal")
if(H.dna.species.name == "Lizardperson") // lizard nerd
sleeve = mutable_appearance('hyperstation/icons/obj/fleshlight.dmi', "portal_sleeve_lizard")
if(H.dna.species.name == "Slimeperson") // slime nerd
sleeve = mutable_appearance('hyperstation/icons/obj/fleshlight.dmi', "portal_sleeve_slime")
if(H.dna.species.name == "Avian") // bird nerd
sleeve = mutable_appearance('hyperstation/icons/obj/fleshlight.dmi', "portal_sleeve_avian")
sleeve.color = "#" + H.dna.features["mcolor"]
add_overlay(sleeve)
if(G.name == "vagina")
organ = mutable_appearance('hyperstation/icons/obj/fleshlight.dmi', "portal_vag")
organ.color = portalunderwear.loc.color
if(G.name == "anus")
organ = mutable_appearance('hyperstation/icons/obj/fleshlight.dmi', "portal_anus")
organ.color = "#" + H.dna.features["mcolor"]
useable = TRUE
add_overlay(organ)
else
useable = FALSE
//Hyperstation 13 portal underwear
//can be attached to vagina or anus, just like the vibrator, still requires pairing with the portallight
/obj/item/portalpanties
name = "portal panties"
desc = "A silver love(TM) pair of portal underwear, with bluespace tech allows lovers to hump at a distance. Needs to be paired with a portal fleshlight before use."
@@ -217,6 +252,7 @@
else
. += "<span class='notice'>The device is paired, and awaiting attachment. </span>"
/obj/item/portalpanties/attackby(obj/item/I, mob/living/user) //pairing
if(istype(I, /obj/item/portallight))
var/obj/item/portallight/P = I
@@ -232,9 +268,11 @@
..() //just allows people to hit it with other objects, if they so wished.
/obj/item/portalpanties/attack(mob/living/carbon/C, mob/living/user)
if(!portallight) //we arent paired yet! noobie trap, let them know.
to_chat(user, "<span class='warning'>[src] can only be attached once paired with a portal fleshlight.</span>")
return
var/obj/item/organ/genital/picked_organ
var/mob/living/carbon/human/S = user
var/mob/living/carbon/human/T = C
@@ -244,17 +282,21 @@
"<span class='warning'>[user] is trying to put [src] on you!</span>")
if(!do_mob(user, C, 3 SECONDS))//warn them and have a delay of 5 seconds to apply.
return
if((picked_organ.name == "vagina")||(picked_organ.name == "anus")) //only fits on a vagina or anus
src.shapetype = picked_organ.name
if(!picked_organ.equipment)
to_chat(user, "<span class='love'>You wrap [src] around [T]'s [picked_organ.name].</span>")
else
to_chat(user, "<span class='notice'>They already have [picked_organ.equipment.name] there.</span>")
return
if(!user.transferItemToLoc(src, picked_organ)) //check if you can put it in
return
src.attached = TRUE
picked_organ.equipment = src
var/obj/item/portallight/P = portallight
//now we need to send what they look like, but saddly if the person changes colour for what ever reason, it wont update. but dont tell people shh.
if(P) //just to make sure
@@ -270,7 +312,6 @@
var/obj/item/portallight/P = portallight
P.updatesleeve()
/obj/item/storage/box/portallight
name = "Portal Fleshlight and Underwear"
icon = 'hyperstation/icons/obj/fleshlight.dmi'
hyperstation/code/obj/kinkyclothes.dm
+3 -41
View File
@@ -160,6 +160,9 @@ obj/item/clothing/neck/stole/black
var/firstpickup = TRUE
var/pickupsound = TRUE
/obj/item/clothing/under/vaultsuit/no_sound
pickupsound = FALSE
/obj/item/clothing/under/vaultsuit/equipped(mob/user, slot)
. = ..()
if(!pickupsound)
@@ -195,44 +198,3 @@ obj/item/clothing/neck/stole/black
body_parts_covered = CHEST|LEGS|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
/obj/item/clothing/suit/threepwoodjacket
name = "threepwood's jacket"
desc = "A jacket fit for a Mighty Pirate!"
icon = 'hyperstation/icons/obj/clothing/suits.dmi'
icon_state = "threepwoodjacket"
alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
item_state = "b_suit"
var/firstpickup = TRUE
var/pickupsound = TRUE
/obj/item/clothing/suit/threepwoodjacket/equipped(mob/user, slot)
. = ..()
if(!pickupsound)
return
if(!ishuman(user))
return
if(slot == SLOT_WEAR_SUIT)
if(!firstpickup)
SEND_SOUND(user, sound('hyperstation/sound/effects/vaultsuit/FalloutEXPUp.ogg', volume = 00))
else
firstpickup = FALSE
SEND_SOUND(user, sound('hyperstation/sound/effects/vaultsuit/bartandfink.ogg', volume = 60))
return
/obj/item/clothing/under/threepwood
name = "threepwood's outfit"
desc = "An outfit fit for a Mighty Pirate!."
icon = 'hyperstation/icons/obj/clothing/uniforms.dmi'
icon_state = "threepwood"
alternate_worn_icon = 'hyperstation/icons/mobs/uniforms.dmi'
item_state = "w_suit"
can_adjust = FALSE
/obj/item/clothing/shoes/threepwoodboots
name = "threepwood's boots"
desc = "A pair of boots fit for a Mighty Pirate!."
icon = 'hyperstation/icons/obj/clothing/shoes.dmi'
icon_state = "threepwoodboots"
alternate_worn_icon = 'hyperstation/icons/obj/clothing/shoes.dmi'
item_state = "threepwoodboots"
alternate_worn_icon = 'hyperstation/icons/mobs/feet.dmi'
hyperstation/code/obj/pregnancytester.dm
+23 -20
View File
@@ -8,6 +8,7 @@
var/results = "null"
w_class = WEIGHT_CLASS_TINY
/obj/item/pregnancytest/attack_self(mob/user)
if(QDELETED(src))
return
@@ -15,26 +16,28 @@
return
if(isAI(user))
return
if(user.stat > CONSCIOUS)//unconscious or dead
if(user.stat > 0)//unconscious or dead
return
Test(user)
if(status == 1)
return //Already been used once, pregnancy tests only work once.
test(user)
/obj/item/pregnancytest/proc/force(mob/living/user)
//Force it negative
icon_state = "negative"
name = "[results] pregnancy test"
status = 1
to_chat(user, "<span class='notice'>You use the pregnancy test, the display reads negative!</span>")
/obj/item/pregnancytest/proc/test(mob/living/user)
/obj/item/pregnancytest/proc/Test(mob/living/user)
if(status)
return
var/_results = FALSE
var/obj/item/organ/genital/womb/W = user.getorganslot("womb")
if(!W)
return // no reason to waste the single-use on them
if(W.pregnant)
_results = TRUE
UpdateResult(user, _results)
/obj/item/pregnancytest/proc/UpdateResult(mob/living/user, results)
var/result_text = results ? "positive" : "negative"
src.results = result_text
icon_state = result_text
name = "[results] preganancy test"
status = TRUE
if(user)
to_chat(user, "<span class='notice'>You use the pregnancy test, the display reads [results]!</span>")
if(W.pregnant == 1)
results = "positive"
icon_state = "positive"
name = "[results] pregnancy test"
status = 1
to_chat(user, "<span class='notice'>You use the pregnancy test, the display reads positive!</span>")
else
force(user)
hyperstation/code/obj/vibrator.dm
+4 -3
View File
@@ -132,13 +132,14 @@ Code:
if(2) //med, can make you cum
to_chat(U, "<span class='love'>You feel intense pleasure surge through your [G.name]</span>")
U.do_jitter_animation()
U.mob_climax_instant()
if (U.getArousalLoss() >= 100 && ishuman(U) && U.has_dna())
U.mob_climax(forced_climax=TRUE)
if(3) //high, makes you stun
to_chat(U, "<span class='userdanger'>You feel overpowering pleasure surge through your [G.name]</span>")
U.Jitter(3)
U.Stun(30)
if (U.can_orgasm())
U.mob_climax_instant()
if (U.getArousalLoss() >= 100 && ishuman(U) && U.has_dna())
U.mob_climax(forced_climax=TRUE)
if(prob(50))
U.emote("moan")