cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-20 03:23:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation

Browse Source
This commit is contained in:
AnonymousHybi
2018-03-20 20:39:42 +00:00
parent 370c11d6de 9b64ef073e
commit d90ec29b5c
12 changed files with 275 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+5 -1
View File
@@ -240,6 +240,10 @@
path = /obj/item/clothing/under/rank/bartender/skirt
allowed_roles = list("Bartender")
/datum/gear/uniform/suit/waiter
display_name = "waiter uniform"
path = /obj/item/clothing/under/waiter
/datum/gear/uniform/scrub
display_name = "scrubs selection"
path = /obj/item/clothing/under/rank/medical/scrubs
@@ -456,4 +460,4 @@
/datum/gear/uniform/westernbustle
display_name = "western bustle"
path = /obj/item/clothing/under/dress/westernbustle
path = /obj/item/clothing/under/dress/westernbustle
code/modules/events/event_container_vr.dm
+5 -5
View File
@@ -39,18 +39,18 @@
//new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Ian Storm", /datum/event/ianstorm, 1, list(), 1),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Money Lotto", /datum/event/money_lotto, 0, list(ASSIGNMENT_ANY = 1), 1, 5, 15),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Mundane News", /datum/event/mundane_news, 300),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "PDA Spam", /datum/event/pda_spam, 0, list(ASSIGNMENT_ANY = 4), 1, 25, 50),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Shipping Error", /datum/event/shipping_error , 30, list(ASSIGNMENT_ANY = 2), 0),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Trivial News", /datum/event/trivial_news, 400),
// Spawns mice, lizards, or dud spiderlings
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Vermin Infestation",/datum/event/infestation, 100, list(ASSIGNMENT_JANITOR = 100), 1),
// Rot only weakens walls, not destroy them
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Wallrot", /datum/event/wallrot, 0, list(ASSIGNMENT_ENGINEER = 30, ASSIGNMENT_GARDENER = 50), 1),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Supply Demand", /datum/event/supply_demand, 0, list(ASSIGNMENT_ANY = 5, ASSIGNMENT_SCIENCE = 15, ASSIGNMENT_GARDENER = 10, ASSIGNMENT_ENGINEER = 10, ASSIGNMENT_MEDICAL = 15), 1),
)
add_disabled_events(list(
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Lost Carp", /datum/event/carp_migration, 20, list(ASSIGNMENT_SECURITY = 10), 1),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Money Hacker", /datum/event/money_hacker, 0, list(ASSIGNMENT_ANY = 4), 1, 10, 25),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Supply Demand", /datum/event/supply_demand, 0, list(ASSIGNMENT_ANY = 5, ASSIGNMENT_SCIENCE = 15, ASSIGNMENT_GARDENER = 10, ASSIGNMENT_ENGINEER = 10, ASSIGNMENT_MEDICAL = 15), 1),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "PDA Spam", /datum/event/pda_spam, 0, list(ASSIGNMENT_ANY = 4), 1, 25, 50),
))
/datum/event_container/moderate/New()
@@ -76,6 +76,7 @@
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Xenobiology Breach", /datum/event/prison_break/xenobiology, 0, list(ASSIGNMENT_SCIENCE = 100), 1),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Grub Infestation", /datum/event/grub_infestation, 40, list(ASSIGNMENT_SECURITY = 50, ASSIGNMENT_ENGINEER = 50), 1),
//Evil grubs that drain station power slightly
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Space Dust", /datum/event/dust, 80, list(ASSIGNMENT_ENGINEER = 30)),
)
add_disabled_events(list(
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Appendicitis", /datum/event/spontaneous_appendicitis, 0, list(ASSIGNMENT_MEDICAL = 30), 1),
@@ -85,7 +86,6 @@
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Radiation Storm", /datum/event/radiation_storm, 50, list(ASSIGNMENT_MEDICAL = 50), 1),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Random Antagonist", /datum/event/random_antag, 2.5, list(ASSIGNMENT_SECURITY = 1), 1, 0, 5),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Rogue Drones", /datum/event/rogue_drone, 20, list(ASSIGNMENT_SECURITY = 60)),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Space Dust", /datum/event/dust, 80, list(ASSIGNMENT_ENGINEER = 30)),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Spider Infestation", /datum/event/spider_infestation, 100, list(ASSIGNMENT_SECURITY = 40), 1),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Supply Demand", /datum/event/supply_demand, 0, list(ASSIGNMENT_ANY = 5, ASSIGNMENT_SCIENCE = 15, ASSIGNMENT_GARDENER = 10, ASSIGNMENT_ENGINEER = 10, ASSIGNMENT_MEDICAL = 15), 1),
))
@@ -94,12 +94,12 @@
available_events = list(
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Nothing", /datum/event/nothing, 900),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Atmos Leak", /datum/event/atmos_leak, 30, list(ASSIGNMENT_ENGINEER = 25), 1),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Meteor Strike", /datum/event/meteor_strike, 10, list(ASSIGNMENT_ENGINEER = 15) ,1)
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Meteor Strike", /datum/event/meteor_strike, 10, list(ASSIGNMENT_ENGINEER = 15) ,1),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Containment Breach", /datum/event/prison_break/station,0,list(ASSIGNMENT_ANY = 5)),
)
add_disabled_events(list(
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Blob", /datum/event/blob, 10, list(ASSIGNMENT_ENGINEER = 60), 1),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Carp Migration", /datum/event/carp_migration, 10, list(ASSIGNMENT_SECURITY = 10), 1),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Containment Breach", /datum/event/prison_break/station,0,list(ASSIGNMENT_ANY = 5)),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Meteor Wave", /datum/event/meteor_wave, 30, list(ASSIGNMENT_ENGINEER = 30), 1),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Space Vines", /datum/event/spacevine, 20, list(ASSIGNMENT_ENGINEER = 15), 1),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Supply Demand", /datum/event/supply_demand, 0, list(ASSIGNMENT_ANY = 5, ASSIGNMENT_SCIENCE = 15, ASSIGNMENT_GARDENER = 10, ASSIGNMENT_ENGINEER = 10, ASSIGNMENT_MEDICAL = 15), 1),
code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
+135
View File
@@ -796,3 +796,138 @@
set category = "Abilities"
pass_flags ^= PASSTABLE //I dunno what this fancy ^= is but Aronai gave it to me.
to_chat(src, "You [pass_flags&PASSTABLE ? "will" : "will NOT"] move over tables/railings/trays!")
/mob/living/carbon/human/proc/succubus_bite()
set name = "Inject Prey"
set desc = "Bite prey and inject them with various toxins."
set category = "Abilities"
if(last_special > world.time)
return
if(!ishuman(src))
return //If you're not a human you don't have permission to do this.
var/mob/living/carbon/human/C = src
var/obj/item/weapon/grab/G = src.get_active_hand()
if(!istype(G))
to_chat(C, "<span class='warning'>You must be grabbing a creature in your active hand to bite them.</span>")
return
var/mob/living/carbon/human/T = G.affecting
if(!istype(T) || T.isSynthetic())
to_chat(src, "<span class='warning'>\The [T] is not able to be bitten.</span>")
return
if(G.state != GRAB_NECK)
to_chat(C, "<span class='warning'>You must have a tighter grip to bite this creature.</span>")
return
var/choice = input(src, "What do you wish to inject?") as null|anything in list("Aphrodisiac", "Numbing", "Paralyzing")
last_special = world.time + 600
if(!choice)
return
src.visible_message("<font color='red'><b>[src] moves their head next to [T]'s neck, seemingly looking for something!</b></font>")
if(do_after(src, 300, T)) //Thrirty seconds.
if(choice == "Aphrodisiac")
src.show_message("<span class='warning'>You sink your fangs into [T] and inject your aphrodisiac!</span>")
src.visible_message("<font color='red'>[src] sinks their fangs into [T]!</font>")
T.bloodstr.add_reagent("succubi_aphrodisiac",5)
return 0
else if(choice == "Numbing")
src.show_message("<span class='warning'>You sink your fangs into [T] and inject your poison!</span>")
src.visible_message("<font color='red'>[src] sinks their fangs into [T]!</font>")
T.bloodstr.add_reagent("numbing_enzyme",5)
else if(choice == "Paralyzing")
src.show_message("<span class='warning'>You sink your fangs into [T] and inject your poison!</span>")
src.visible_message("<font color='red'>[src] sinks their fangs into [T]!</font>")
T.bloodstr.add_reagent("succubi_paralize",5)
else
return //Should never happen
/*
mob/living/carbon/proc/charmed() //TODO
charmed = 1
spawn(0)
for(var/i = 1,i > 0, i--)
src << "<font color='blue'><i>... [pick(charmed)] ...</i></font>"
charmed = 0
*/
/datum/reagent/succubi_aphrodisiac
name = "Aphrodisiac"
id = "succubi_aphrodisiac"
description = "A unknown liquid, it smells sweet"
color = "#8A0829"
scannable = 0
/datum/reagent/succubi_aphrodisiac/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(prob(7))
M.show_message("<span class='warning'>You feel funny, and fall in love with the person in front of you</span>")
M.emote(pick("blush", "moans", "giggles", "turns visibly red"))
//M.charmed() //TODO
return
/*
/datum/reagent/succubi_numbing //Using numbing_enzyme instead.
name = "Numbing Fluid"
id = "succubi_numbing"
description = "A unknown liquid, it doesn't smell"
color = "#41029B"
scannable = 0
/datum/reagent/succubi_numbing/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
*/
/datum/reagent/succubi_paralize
name = "Paralyzing Fluid"
id = "succubi_numbing"
description = "A unknown liquid, it doesn't smell"
color = "#41029B"
scannable = 0
/datum/reagent/succubi_paralize/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(prob(7))
M.show_message("<span class='warning'>You lose sensation of your body.</span>")
M.Weaken(10)
return
/mob/living/carbon/human/proc/face_sit()
set name = "Face Sit"
set desc = "Sit on your Preys Face"
set category = "Abilities"
if(last_special > world.time)
return
if(!ishuman(src))
return //If you're not a human you don't have permission to do this.
var/mob/living/carbon/human/C = src
var/obj/item/weapon/grab/G = src.get_active_hand()
if(!istype(G))
to_chat(C, "<span class='warning'>You must be grabbing a creature in your active hand to sit on them.</span>")
return
var/mob/living/carbon/human/T = G.affecting
if(!istype(T) || T.isSynthetic())
to_chat(src, "<span class='warning'>\The [T] is not able to be sit on.</span>")
return
if(G.state != GRAB_AGGRESSIVE)
to_chat(C, "<span class='warning'>You must have the creature pinned on the ground to sit on them </span>")
return
src.visible_message("<font color='red'><b>[src] moves their ass to [T]'s head, sitting down on them, making them unable to see anything else than [src]'s butt </b></font>")
return
code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
+18
View File
@@ -113,3 +113,21 @@
..(S,H)
H.verbs |= /mob/living/proc/glow_toggle
H.verbs |= /mob/living/proc/glow_color
/datum/trait/face_sit
name = "Face_Sitting"
desc = "Makes you able to sit on your prey"
cost = 0
/datum/trait/face_sit/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..(S,H)
H.verbs |= /mob/living/carbon/human/proc/face_sit
/datum/trait/succubus_bite
name = "Succubus Bite"
desc = "Makes you able to bite prey in your grasp and subject them to a variety of chemicals.."
cost = 0
/datum/trait/succubus_drain/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..(S,H)
H.verbs |= /mob/living/carbon/human/proc/succubus_bite
code/modules/mob/living/simple_animal/vore/shadekin/types.dm
+36 -7
View File
@@ -68,7 +68,7 @@
slippery gullet of the creature. It's warm, and the air is thick. You can hear its body \
squelch and shift around you as you settle into its stomach! It's oddly calm, and very dark. \
The doughy flesh rolls across your form in gentle waves. The aches and pains across your form slowly begin to \
diminish, your body is healing much faster than normal! You’re also soon soaked in harmless slime."
diminish, your body is healing much faster than normal! You’re also soon soaked in harmless slime."
player_msg = "You've chosen to generate your own energy rather than taking \
it from others. Most of the time, anyway. You don't have a need to steal energy from others, and gather it up \
@@ -108,8 +108,8 @@
stalker = TRUE
vore_stomach_flavor = "You slip passed pointy triangle teeth and down the slick, slippery gullet of the creature. \
It's warm, and the air is thick. You can hear its body squelch and shift around you as you settle into its stomach! \
It’s relatively calm inside the dark organ. Wet and almost molten for how gooey your surroundings feel. \
You can feel the doughy walls cling to you posessively... It’s almost like you could sink into them. \
It’s relatively calm inside the dark organ. Wet and almost molten for how gooey your surroundings feel. \
You can feel the doughy walls cling to you posessively... It’s almost like you could sink into them. \
There is also an ominous gurgling from somewhere nearby..."
player_msg = "You're familiar with generating your own energy, but occasionally \
@@ -150,7 +150,7 @@
vore_stomach_flavor = "You slip passed pointy triangle teeth and down the slick, slippery gullet \
of the creature. It's warm, and the air is thick. You can hear its body squelch and shift around you \
as you settle into its stomach! The doughy walls within cling to you heavily, churning down on you, wearing \
you out!! There doesn’t appear to be any actual danger here, harmless slime clings to you, but it’s getting \
you out!! There doesn’t appear to be any actual danger here, harmless slime clings to you, but it’s getting \
harder and harder to move as those walls press in on you insistently!"
player_msg = "Your kind rarely ventures into realspace. Being in any well-lit \
@@ -190,7 +190,7 @@
vore_stomach_flavor = "You slip passed pointy triangle teeth and down the slick, slippery gullet \
of the creature. It's warm, and the air is thick. You can hear its body squelch and shift around you \
as you settle into its stomach! The doughy walls within cling to you heavily, churning down on you, wearing \
you out!! There doesn’t appear to be any actual danger here, harmless slime clings to you, but it’s getting \
you out!! There doesn’t appear to be any actual danger here, harmless slime clings to you, but it’s getting \
harder and harder to move as those walls press in on you insistently!"
player_msg = "Your kind rarely ventures into realspace. Being in any well-lit area is very taxing on you, but you \
@@ -248,9 +248,38 @@
desc = "She appears to be a fluffer of some sort. Deep blue eyes and curious attitude."
icon_state = "rivyr"
eye_desc = ""
vore_stomach_flavor = "Blue flesh gleams in the fading light as you slip down the little mar’s gullet! \
Gooey flesh and heat surrounds your form as you’re tucked away into the darkness of her stomach! Thick slimes cling \
vore_stomach_flavor = "Blue flesh gleams in the fading light as you slip down the little mar’s gullet! \
Gooey flesh and heat surrounds your form as you’re tucked away into the darkness of her stomach! Thick slimes cling \
to you, but they seem to be harmless. The organ gently churns around you, clinging to your shape and forcing \
you to curl up a bit. You can feel her rub at you some through the layers of flesh and fluff, while aches \
and pains begin to fade away across your body."
player_msg = "Mar? Mar mar. Mar mar mar. Mar. Mar mar? Mar! Mar. Marrrr."
//thanks john
/mob/living/simple_animal/shadekin/yellow/niko
name = "Niko"
desc = "They appear to be a Neko of some sort, containing Glowing yellow eyes and cattitude."
icon_state = "niko"
eye_desc = ""
vore_stomach_flavor = "Look, if you had one shot, one opportunity. To seize everything you ever wanted. One moment. Would you capture it or just let it slip?"
player_msg = "Nyan?"
light_range = 5
light_power = 1
light_color = "#FFFF00"
luminosity = 5
/mob/living/simple_animal/shadekin/blue/luna
name = "Luna"
desc = "She appears to be a fuzzy critter of some sort. Her eyes shimmer a dark blue, glancing around curiously."
icon_state = "luna"
eye_desc = "e_blue"
vore_stomach_flavor = "Dark blue flesh fills your vision as you slip past the Shadekin's tongue and into the darkness \
of her gullet. The flesh around you seems squishy and pliable and malleable to say the least, warmth rolling up \
your body as the humid air rises across the deeper you slide into the darkness of her stomach. As you splash \
inside, you curl up comfortably inside the walls that churn and squeeze around you, any fidgeting quickly \
subdued by the strength of the walls, and any movement of your predator seems to coax a light sway from \
your current prison. The slime inside stuck fairly well, though harmless - your aches and pains slowly soothing \
up and fading away."
player_msg = "You are a shadekin that goes by the name of Luna. Curious, you have tasked yourself and yourself alone \
with studying this foreign world. Learn their language. Learn their culture. Adapt. Everything is wonderful and new, \
and your mind is set on retaining knowledge of these odd planescape."
code/modules/power/solar.dm
+1 -1
View File
@@ -534,7 +534,7 @@ var/list/solars_list = list()
/obj/machinery/power/solar_control/autostart/New()
..()
spawn(150) // Wait 15 seconds to ensure everything was set up properly (such as, powernets, solar panels, etc.
spawn(300) // Wait 15 seconds to ensure everything was set up properly (such as, powernets, solar panels, etc.
src.search_for_connected()
if(connected_tracker && track == 2)
connected_tracker.set_angle(sun.angle)