cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-31 07:56:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into TFF-Infinite_Frame_Fixy

Browse Source
This commit is contained in:
TheFurryFeline
2019-06-03 18:18:03 -04:00
parent e3e442e9b0 95aa39d802
commit 6820f7c974
36 changed files with 629 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/suits/aliens/seromi.dm
+6 -1
View File
@@ -227,9 +227,14 @@
/obj/item/clothing/suit/storage/seromi/cloak/jobs/sec
name = "Security cloak"
desc = "A soft teshari cloak made for the Security department"
desc = "A soft teshari cloak made for the Security department. This one is made with stronger fibers."
icon_state = "tesh_cloak_sec"
item_state = "tesh_cloak_sec"
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/flashlight/maglight,/obj/item/clothing/head/helmet)
body_parts_covered = UPPER_TORSO|LOWER_TORSO
item_flags = THICKMATERIAL
siemens_coefficient = 0.6
armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 10, bio = 0, rad = 0)
/obj/item/clothing/suit/storage/seromi/cloak/jobs/qm
name = "Quartermaster's cloak"
code/modules/clothing/under/xenos/seromi.dm
+4 -1
View File
@@ -262,9 +262,12 @@
/obj/item/clothing/under/seromi/undercoat/jobs/sec
name = "Security undercoat"
desc = "A traditional teshari garb made for the Security department"
desc = "A traditional teshari garb made for the Security department. Made with slightly sturdier materials"
icon_state = "tesh_uniform_sec"
item_state = "tesh_uniform_sec"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
/obj/item/clothing/under/seromi/undercoat/jobs/qm
name = "Quartermaster's undercoat"
code/modules/events/escaped_slimes.dm
+4 -3
View File
@@ -36,9 +36,10 @@
/datum/event/escaped_slimes/start()
// world << "TEST-SPAWN START"
var/list/vents = list()
for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in world)
if(temp_vent.network && temp_vent.loc.z in using_map.station_levels && !is_area_occupied(temp_vent.loc.loc)) //borrowed from spiders event, but it works. Distribute the slimes only in rooms with vents
vents += temp_vent
for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in machines)
if(!temp_vent.welded && !is_area_occupied(temp_vent.loc.loc) && temp_vent.network && temp_vent.loc.z in using_map.station_levels) //borrowed from spiders event, but it works. Distribute the slimes only in rooms with vents
if(temp_vent.network.normal_members.len > 50)
vents += temp_vent
while((spawncount > 0) && vents.len)
var/obj/vent = pick(vents)
code/modules/events/event_container_vr.dm
+4 -4
View File
@@ -34,7 +34,6 @@
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Brand Intelligence",/datum/event/brand_intelligence,20, list(ASSIGNMENT_JANITOR = 25), 1),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Camera Damage", /datum/event/camera_damage, 20, list(ASSIGNMENT_ENGINEER = 20, ASSIGNMENT_AI = 40)),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Canister Leak", /datum/event/canister_leak, 10, list(ASSIGNMENT_ENGINEER = 20)),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Space Dust", /datum/event/dust, 50, list(ASSIGNMENT_ENGINEER = 20), 1, 0, 50),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Economic News", /datum/event/economic_event, 300),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Electrified Door", /datum/event/electrified_door, -5, list(ASSIGNMENT_MEDICAL = 5, ASSIGNMENT_ENGINEER = 20, ASSIGNMENT_AI = 10)),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Lost Carp", /datum/event/carp_migration, 20, list(ASSIGNMENT_SECURITY = 10), 1),
@@ -54,6 +53,7 @@
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Ian Storm", /datum/event/ianstorm, 1, list(), 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, "PDA Spam", /datum/event/pda_spam, 0, list(ASSIGNMENT_ANY = 4), 1, 25, 50),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Space Dust", /datum/event/dust, 50, list(ASSIGNMENT_ENGINEER = 20), 1, 0, 50),
))
/datum/event_container/moderate/New()
@@ -66,7 +66,6 @@
// Just disables comms for a short while.
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Communication Blackout", /datum/event/communications_blackout, 500, list(ASSIGNMENT_AI = 150, ASSIGNMENT_SECURITY = 120), 1),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Carp School", /datum/event/carp_migration, -50, list(ASSIGNMENT_ENGINEER = 20, ASSIGNMENT_SECURITY = 30), 1),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Escaped Slimes", /datum/event/escaped_slimes, -60, list(ASSIGNMENT_SCIENTIST = 40, ASSIGNMENT_SECURITY = 30)),
// Just blows out a few lights
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Electrical Storm", /datum/event/electrical_storm, 250, list(ASSIGNMENT_ENGINEER = 20, ASSIGNMENT_JANITOR = 150), 1),
// This one is just too fun.
@@ -101,6 +100,7 @@
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Spider Infestation_NoRequirements", /datum/event/spider_infestation, 100, list(ASSIGNMENT_SECURITY = 40), 0),
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),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Random Antagonist", /datum/event/random_antag, 3, list(ASSIGNMENT_SECURITY = 1), 1, 0, 5),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Escaped Slimes", /datum/event/escaped_slimes, -60, list(ASSIGNMENT_SCIENTIST = 40, ASSIGNMENT_SECURITY = 30)),
))
/datum/event_container/major/New()
@@ -110,11 +110,9 @@
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Blob", /datum/event/blob, -25, list(ASSIGNMENT_SECURITY = 10, ASSIGNMENT_ENGINEER = 5), 1),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Carp Migration", /datum/event/carp_migration, -30, list(ASSIGNMENT_SECURITY = 10), 1),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Containment Breach", /datum/event/prison_break/station,0, list(ASSIGNMENT_ANY = 5), 0),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Escaped Slimes", /datum/event/escaped_slimes, -25, list(ASSIGNMENT_SCIENTIST = 10, ASSIGNMENT_SECURITY = 5), 0),
// TFF: Virgo event commented out. Technically meant for Tether maps, not Polaris.
// 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 Wave", /datum/event/meteor_wave, -30, list(ASSIGNMENT_ENGINEER = 10), 1),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Space Dust", /datum/event/dust, 50, list(ASSIGNMENT_ENGINEER = 30), 0),
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, "Spider Infestation", /datum/event/spider_infestation, -25, list(ASSIGNMENT_SECURITY = 10), 0),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Viral Infection", /datum/event/viral_infection, -30, list(ASSIGNMENT_MEDICAL = 10), 1),
@@ -127,6 +125,8 @@
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Spider Infestation_NoRequirements", /datum/event/spider_infestation, 30, list(ASSIGNMENT_SECURITY = 10), 0),
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),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Viral Infection_NoRequirements", /datum/event/viral_infection, 50, list(ASSIGNMENT_MEDICAL = 50), 1),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Escaped Slimes", /datum/event/escaped_slimes, -25, list(ASSIGNMENT_SCIENTIST = 10, ASSIGNMENT_SECURITY = 5), 0),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Space Dust", /datum/event/dust, 50, list(ASSIGNMENT_ENGINEER = 30), 0),
))
#undef ASSIGNMENT_ANY
code/modules/materials/material_recipes.dm
+52 -1
View File
@@ -46,6 +46,57 @@
new/datum/stack_recipe("purple comfy chair", /obj/structure/bed/chair/comfy/purp, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("green comfy chair", /obj/structure/bed/chair/comfy/green, 2, one_per_turf = 1, on_floor = 1), \
))
recipes += new/datum/stack_recipe_list("left sofa end", list( \
new/datum/stack_recipe("beige left sofa", /obj/structure/bed/chair/sofa/left/beige, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("black left sofa", /obj/structure/bed/chair/sofa/left/black, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("brown left sofa", /obj/structure/bed/chair/sofa/left/brown, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("lime left sofa", /obj/structure/bed/chair/sofa/left/lime, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("teal left sofa", /obj/structure/bed/chair/sofa/left/teal, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("red left sofa", /obj/structure/bed/chair/sofa/left/red, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("blue left sofa", /obj/structure/bed/chair/sofa/left/blue, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("purple left sofa", /obj/structure/bed/chair/sofa/left/purp, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("green left sofa", /obj/structure/bed/chair/sofa/left/green, 2, one_per_turf = 1, on_floor = 1), \
))
recipes += new/datum/stack_recipe_list("middle sofa", list( \
new/datum/stack_recipe("beige middle sofa", /obj/structure/bed/chair/sofa/beige, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("black middle sofa", /obj/structure/bed/chair/sofa/black, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("brown middle sofa", /obj/structure/bed/chair/sofa/brown, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("lime middle sofa", /obj/structure/bed/chair/sofa/lime, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("teal middle sofa", /obj/structure/bed/chair/sofa/teal, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("red middle sofa", /obj/structure/bed/chair/sofa/red, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("blue middle sofa", /obj/structure/bed/chair/sofa/blue, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("purple middle sofa", /obj/structure/bed/chair/sofa/purp, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("green middle sofa", /obj/structure/bed/chair/sofa/green, 2, one_per_turf = 1, on_floor = 1), \
))
recipes += new/datum/stack_recipe_list("right sofa end", list( \
new/datum/stack_recipe("beige right sofa", /obj/structure/bed/chair/sofa/right/beige, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("black right sofa", /obj/structure/bed/chair/sofa/right/black, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("brown right sofa", /obj/structure/bed/chair/sofa/right/brown, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("lime right sofa", /obj/structure/bed/chair/sofa/right/lime, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("teal right sofa", /obj/structure/bed/chair/sofa/right/teal, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("red right sofa", /obj/structure/bed/chair/sofa/right/red, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("blue right sofa", /obj/structure/bed/chair/sofa/right/blue, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("purple right sofa", /obj/structure/bed/chair/sofa/right/purp, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("green right sofa", /obj/structure/bed/chair/sofa/right/green, 2, one_per_turf = 1, on_floor = 1), \
))
recipes += new/datum/stack_recipe_list("corner sofa", list( \
new/datum/stack_recipe("beige corner sofa", /obj/structure/bed/chair/sofa/corner/beige, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("black corner sofa", /obj/structure/bed/chair/sofa/corner/black, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("brown corner sofa", /obj/structure/bed/chair/sofa/corner/brown, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("lime corner sofa", /obj/structure/bed/chair/sofa/corner/lime, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("teal corner sofa", /obj/structure/bed/chair/sofa/corner/teal, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("red corner sofa", /obj/structure/bed/chair/sofa/corner/red, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("blue corner sofa", /obj/structure/bed/chair/sofa/corner/blue, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("purple corner sofa", /obj/structure/bed/chair/sofa/corner/purp, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("green corner sofa", /obj/structure/bed/chair/sofa/corner/green, 2, one_per_turf = 1, on_floor = 1), \
))
recipes += new/datum/stack_recipe_list("old sofa", list( \
new/datum/stack_recipe("left sofa end", /obj/structure/bed/chair/oldsofa/left, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("middle sofa", /obj/structure/bed/chair/oldsofa, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("right sofa end", /obj/structure/bed/chair/oldsofa/right, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("corner sofa", /obj/structure/bed/chair/oldsofa/corner, 2, one_per_turf = 1, on_floor = 1), \
))
recipes += new/datum/stack_recipe("table frame", /obj/structure/table, 1, time = 10, one_per_turf = 1, on_floor = 1)
recipes += new/datum/stack_recipe("bench frame", /obj/structure/table/bench, 1, time = 10, one_per_turf = 1, on_floor = 1)
recipes += new/datum/stack_recipe("rack", /obj/structure/table/rack, 1, time = 5, one_per_turf = 1, on_floor = 1)
@@ -124,7 +175,7 @@
recipes += new/datum/stack_recipe("water-cooler", /obj/structure/reagent_dispensers/water_cooler, 4, time = 10, one_per_turf = 1, on_floor = 1)
recipes += new/datum/stack_recipe("lampshade", /obj/item/weapon/lampshade, 1, time = 1)
recipes += new/datum/stack_recipe("Feeder", /obj/machinery/feeder, 4, time = 20, one_per_turf = 1, on_floor = 1)
/material/wood/generate_recipes()
..()
recipes += new/datum/stack_recipe("oar", /obj/item/weapon/oar, 2, time = 30, supplied_material = "[name]")
code/modules/mob/living/carbon/human/human_attackhand.dm
+4 -1
View File
@@ -284,7 +284,8 @@
apply_damage(real_damage, hit_dam_type, hit_zone, armour, soaked, sharp=attack.sharp, edge=attack.edge)
if(I_DISARM)
add_attack_logs(H,src,"Disarmed")
// Having this log every time someone disarms even when the disarm does nothing is REALLY ANNOYING. -Erik
// add_attack_logs(H,src,"Disarmed")
M.do_attack_animation(src)
@@ -309,6 +310,8 @@
visible_message("<span class='warning'>[M] has weakly pushed [src]!</span>")
return
add_attack_logs(H,src,"Disarmed")
var/randn = rand(1, 100)
last_push_time = world.time
if(!(species.flags & NO_SLIP) && randn <= 25)
code/modules/mob/living/simple_animal/vore/shadekin/types.dm
+79 -59
View File
@@ -257,73 +257,93 @@
//thanks john
/mob/living/simple_animal/shadekin/blue/niko
name = "Niko"
desc = "They appear to be a Neko of some sort, containing Glowing yellow eyes and cattitude."
icon_state = "niko"
eye_desc = "yellow eyes"
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 = "You are NOT a cat, your objective is to... wait this is the wrong game."
glow_range = 5
glow_toggle = 1
luminosity = 5
energy_adminbuse = 1
hostile = "FALSE"
retaliate = "FALSE"
eye_state = 0
attacktext = list("clawed")
name = "Niko"
desc = "They appear to be a Neko of some sort, containing Glowing yellow eyes and cattitude."
icon_state = "niko"
eye_desc = "yellow eyes"
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 = "You are NOT a cat, your objective is to... wait this is the wrong game."
glow_range = 5
glow_toggle = 1
luminosity = 5
energy_adminbuse = 1
hostile = "FALSE"
retaliate = "FALSE"
eye_state = 0
attacktext = list("clawed")
/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 = "blue eyes"
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."
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 = "blue eyes"
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."
//"All your chickens are belong to me!" - Zylas
/mob/living/simple_animal/shadekin/purple/zylas
name ="Zylas"
desc = "He's a chubby looking creature, black and grey fur accompanied by purple eyes and a large hoody."
icon_state = "zylashoody"
eye_desc = "purple eyes"
vore_stomach_flavor = "You are trapped in a cramped tight space. The color purple seems to dominate your vision. \
His walls rolled over your form as you lay trapped in his depths. There wasnt a drop of fluid in sight inside that \
stomach. Instead, you could feel your energy slowly draining away over time, like... he was leeching off you."
player_msg = "You are Zylas. You enjoy scaring the local population and eating every chicken you find."
name ="Zylas"
desc = "He's a chubby looking creature, black and grey fur accompanied by purple eyes and a large hoody."
icon_state = "zylashoody"
eye_desc = "purple eyes"
vore_stomach_flavor = "You are trapped in a cramped tight space. The color purple seems to dominate your vision. \
His walls rolled over your form as you lay trapped in his depths. There wasnt a drop of fluid in sight inside that \
stomach. Instead, you could feel your energy slowly draining away over time, like... he was leeching off you."
player_msg = "You are Zylas. You enjoy scaring the local population and eating every chicken you find."
//"Two scarves. No more, No Less." -Muninn
/mob/living/simple_animal/shadekin/blue/muninn
name ="Muninn"
desc = "A gray furred shadekin, a little on the hefty side. Rocks two scarves, one on the neck, one on the tail. \
He seems eager to take in the various sights and sounds of the station"
icon_state = "muninn"
eye_desc = "blue eyes"
vore_stomach_flavor = "You're stuck in a warm, tight stomach. \
A blue glow, as soft as the walls surrounding you, illuminates the cramped chamber. \
Muninn's walls gently squeeze over your form, like a tight, yet comfortable hug. \
The gut itself was relatively dry, only slightly damp. \
As Muninn ambles along, you'd gently sway within. It's quite the nice place to stay for a while."
player_msg = "You are Muninn. Today you feel... Curious."
name ="Muninn"
desc = "A gray furred shadekin, a little on the hefty side. Rocks two scarves, one on the neck, one on the tail. \
He seems eager to take in the various sights and sounds of the station"
icon_state = "muninn"
eye_desc = "blue eyes"
vore_stomach_flavor = "You're stuck in a warm, tight stomach. \
A blue glow, as soft as the walls surrounding you, illuminates the cramped chamber. \
Muninn's walls gently squeeze over your form, like a tight, yet comfortable hug. \
The gut itself was relatively dry, only slightly damp. \
As Muninn ambles along, you'd gently sway within. It's quite the nice place to stay for a while."
player_msg = "You are Muninn. Today you feel... Curious."
//"Here's a little lesson in the trickeries" -Muninn
/mob/living/simple_animal/shadekin/purple/muninn
name ="Muninn"
desc = "A gray furred shadekin, a little on the hefty side. Rocks two scarves, one on the neck, one on the tail.\
He seems a little mischevious... better keep an eye on him."
icon_state = "muninn"
eye_desc = "purple eyes"
vore_stomach_flavor = "You're stuck in a warm, tight stomach. \
A purple glow, as soft as the walls surrounding you, illuminates the cramped chamber. \
Muninn's walls gently squeeze over your form, like a tight hug. \
The gut itself was relatively dry, only slightly damp. \
It didn't seem that Muninn was digesting you. More like... sapping your energy and making you feel tired. \
A nap in this comfortable chamber wouldn't be the worst thing, would it?"
player_msg = "You are Muninn. Today you feel... Mischevious."
name ="Muninn"
desc = "A gray furred shadekin, a little on the hefty side. Rocks two scarves, one on the neck, one on the tail.\
He seems a little mischevious... better keep an eye on him."
icon_state = "muninn"
eye_desc = "purple eyes"
vore_stomach_flavor = "You're stuck in a warm, tight stomach. \
A purple glow, as soft as the walls surrounding you, illuminates the cramped chamber. \
Muninn's walls gently squeeze over your form, like a tight hug. \
The gut itself was relatively dry, only slightly damp. \
It didn't seem that Muninn was digesting you. More like... sapping your energy and making you feel tired. \
A nap in this comfortable chamber wouldn't be the worst thing, would it?"
player_msg = "You are Muninn. Today you feel... Mischevious."
//"Hunger." - Rakshasa
/mob/living/simple_animal/shadekin/red/rakshasa
name ="Rakshasa"
desc = "A scary, black shadekin. Thier body oozes whatever goop they are made of.\
He seems a little mischevious... better keep an eye on him."
icon_state = "rakshasa"
eye_desc = "red eyes"
eye_state = "RED_EYES"
vore_stomach_flavor = "You're floating in a warm, viscous goop, too dark to see. \
Your efforts to find light have failed. Darkness consumes you. \
Rakshasa's gelatenous body squeezes over your form, leaving no inch unmolested. \
The hot goop you float in makes it hard to breathe; all consuming of space and light. \
Your body feels hot, growing weaker, more tired. Draining. Darkness coming. \
You struggle to stay awake while floating helplessly in the goo."
player_msg = "You are Rakshasa. You are not to directly harm crew, only consume. You never speak a language."
energy_adminbuse = 1
maxHealth = 999999999999
health = 999999999999
eye_icon_state = "e_rakshasa"
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
+87 -50
View File
@@ -140,7 +140,7 @@
M.drowsyness = max(0, M.drowsyness - 3 * removed * chem_effective)
M.hallucination = max(0, M.hallucination - 6 * removed * chem_effective)
M.adjustToxLoss(-2 * removed * chem_effective)
/datum/reagent/carthatoline
name = "Carthatoline"
id = "carthatoline"
@@ -657,19 +657,26 @@
mrate_static = TRUE
overdose = REAGENTS_OVERDOSE
scannable = 1
data = 0
//data = 0
/datum/reagent/spaceacillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
..()
// if(!delay)
// delay = world.time
if(alien == IS_SLIME)
if(volume <= 0.1 && data != -1)
data = -1
// if(volume <= 0.1 && data != -1)
// data = -1
// else
// var/delay = (5 MINUTES)
// if(world.time > data + delay)
// data = world.time
// to_chat(M, "<span class='warning'>Your senses feel unfocused, and divided.</span>")
// Erik's Edit: Fixes spam chems!
if(volume <= metabolism)
to_chat(M, "<span class='notice'>You regain focus...</span>")
else
var/delay = (5 MINUTES)
if(world.time > data + delay)
data = world.time
to_chat(M, "<span class='warning'>Your senses feel unfocused, and divided.</span>")
if(dose <= metabolism)
to_chat(M, "<span class = 'warning'>Your senses feel unfocused, and divided.</span>")
M.add_chemical_effect(CE_ANTIBIOTIC, dose >= overdose ? ANTIBIO_OD : ANTIBIO_NORM)
/datum/reagent/corophizine
@@ -840,8 +847,6 @@
/* Antidepressants */
#define ANTIDEPRESSANT_MESSAGE_DELAY 5*60*10
/datum/reagent/methylphenidate
name = "Methylphenidate"
id = "methylphenidate"
@@ -850,22 +855,29 @@
reagent_state = LIQUID
color = "#BF80BF"
metabolism = 0.01
ingest_met = 0.25
mrate_static = TRUE
data = 0
var/delay = 0
// data = 0
// var/delay = 0
/datum/reagent/methylphenidate/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(!delay)
delay = world.time
// if(!delay)
// delay = world.time
if(alien == IS_DIONA)
return
if(volume <= 0.1 && data != -1 && world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
delay = world.time
// if(volume <= 0.1 && data != -1 && world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
// delay = world.time
// M << "<span class='warning'>You lose focus...</span>"
// else
// if(world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
// delay = world.time
// M << "<span class='notice'>Your mind feels focused and undivided.</span>"
// Erik's Edit: Fixes spam chems!
if(volume <= metabolism)
M << "<span class='warning'>You lose focus...</span>"
else
if(world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
delay = world.time
M << "<span class='notice'>Your mind feels focused and undivided.</span>"
if(dose <= metabolism)
M << "<span class='notice'>Your mind feels focused and undivided.</span>"
/datum/reagent/citalopram
name = "Citalopram"
@@ -875,22 +887,29 @@
reagent_state = LIQUID
color = "#FF80FF"
metabolism = 0.01
ingest_met = 0.25
mrate_static = TRUE
data = 0
var/delay = 0
// data = 0
// var/delay = 0
/datum/reagent/citalopram/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(!delay)
delay = world.time
// if(!delay)
// delay = world.time
if(alien == IS_DIONA)
return
if(volume <= 0.1 && world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
delay = world.time
// if(volume <= 0.1 && world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
// delay = world.time
// to_chat(M, "<span class='warning'>Your mind feels a little less stable...</span>")
// else
// if(world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
// delay = world.time
// to_chat(M, "<span class='notice'>Your mind feels stable... a little stable.</span>")
// Erik's Edit: Fixes spam chems!
if(volume <= metabolism)
to_chat(M, "<span class='warning'>Your mind feels a little less stable...</span>")
else
if(world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
delay = world.time
to_chat(M, "<span class='notice'>Your mind feels stable... a little stable.</span>")
if(dose <= metabolism)
to_chat(M, "<span class='notice'>Your mind feels stable... a little stable.</span>")
/datum/reagent/paroxetine
name = "Paroxetine"
@@ -900,24 +919,35 @@
reagent_state = LIQUID
color = "#FF80BF"
metabolism = 0.01
ingest_met = 0.25
mrate_static = TRUE
data = 0
var/delay = 0
//data = 0
//var/delay = 0
/datum/reagent/paroxetine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_DIONA)
return
if(volume <= 0.1 && world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
delay = world.time
// if(volume <= 0.1 && world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
// delay = world.time
// M << "<span class='warning'>Your mind feels much less stable...</span>"
// else
// if(world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
// delay = world.time
// if(prob(90))
// M << "<span class='notice'>Your mind feels much more stable.</span>"
// else
// M << "<span class='warning'>Your mind breaks apart...</span>"
// M.hallucination += 200
// Erik's Edit: Fixes spam chems!
if(volume <= metabolism)
M << "<span class='warning'>Your mind feels much less stable...</span>"
else
if(world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
delay = world.time
if(prob(90))
M << "<span class='notice'>Your mind feels much more stable.</span>"
else
M << "<span class='warning'>Your mind breaks apart...</span>"
M.hallucination += 200
if(dose <= metabolism)
if(prob(90))
M << "<span class='notice'>Your mind feels much more stable.</span>"
else
M << "<span class='warning'>Your mind breaks apart...</span>"
M.hallucination += 200
/datum/reagent/qerr_quem
name = "Qerr-quem"
@@ -927,19 +957,26 @@
reagent_state = LIQUID
color = "#e6efe3"
metabolism = 0.01
ingest_met = 0.25
mrate_static = TRUE
data = 0
// data = 0
/datum/reagent/qerr_quem/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_DIONA)
return
if(volume <= 0.1 && data != -1)
data = -1
// if(volume <= 0.1 && data != -1)
// data = -1
// to_chat(M, "<span class='warning'>You feel antsy, your concentration wavers...</span>")
// else
// if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY)
// data = world.time
// to_chat(M, "<span class='notice'>You feel invigorated and calm.</span>")
// Erik's Edit: Fixes spam chems!
if(volume <= metabolism)
to_chat(M, "<span class='warning'>You feel antsy, your concentration wavers...</span>")
else
if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY)
data = world.time
to_chat(M, "<span class='notice'>You feel invigorated and calm.</span>")
if(dose <= metabolism)
to_chat(M, "<span class='notice'>You feel invigorated and calm.</span>")
// This exists to cut the number of chemicals a merc borg has to juggle on their hypo.
/datum/reagent/healing_nanites
code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm
+21 -7
View File
@@ -9,6 +9,12 @@
matter = list("glass" = 500)
icon = 'icons/obj/drinks.dmi'
/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint
name = "metamorphic pint glass"
desc = "This glass changes shape and form depending on the drink inside... fancy!"
icon_state = "pglass_empty"
volume = 60
/obj/item/weapon/reagent_containers/food/drinks/metaglass/on_reagent_change()
if (reagents.reagent_list.len > 0)
var/datum/reagent/R = reagents.get_master_reagent()
@@ -38,12 +44,17 @@
else
price_tag = null
else
icon_state = "glass_empty"
name = "metamorphic glass"
desc = "This glass changes shape and form depending on the drink inside... fancy!"
center_of_mass = list("x"=16, "y"=10)
return
if(type == /obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint)
icon_state = "pglass_empty"
name = "metamorphic pint glass"
desc = "This glass changes shape and form depending on the drink inside... fancy!"
center_of_mass = list("x"=16, "y"=10)
else
icon_state = "glass_empty"
name = "metamorphic glass"
desc = "This glass changes shape and form depending on the drink inside... fancy!"
center_of_mass = list("x"=16, "y"=10)
return
/*
Drinks Data
@@ -374,7 +385,7 @@ Drinks Data
glass_icon_state = "gintonicglass"
/datum/reagent/ethanol/goldschlager
glass_icon_state = "ginvodkaglass"
glass_icon_state = "goldschlagerglass"
glass_center_of_mass = list("x"=16, "y"=12)
/datum/reagent/ethanol/hippies_delight
@@ -569,3 +580,6 @@ Drinks Data
/datum/reagent/ethanol/hachi
glass_icon_state = "hachi"
/datum/reagent/ethanol/mojito
glass_icon_state = "mojito"