mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
[MIRROR] space cleanup (#10414)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
3ef8163aa0
commit
789db280cc
@@ -1,6 +1,6 @@
|
||||
/datum/department/noncrew
|
||||
name = DEPARTMENT_NONCREW
|
||||
short_name = "N/A"
|
||||
sorting_order = -99
|
||||
visible = FALSE
|
||||
assignable = FALSE
|
||||
name = DEPARTMENT_NONCREW
|
||||
short_name = "N/A"
|
||||
sorting_order = -99
|
||||
visible = FALSE
|
||||
assignable = FALSE
|
||||
|
||||
@@ -32,8 +32,8 @@
|
||||
|
||||
/*seems to be a kin only thing?
|
||||
/datum/job/noncrew/is_species_banned(species_name, brain_type)
|
||||
// Any species can join as non-crew, including shadekin.
|
||||
return FALSE
|
||||
// Any species can join as non-crew, including shadekin.
|
||||
return FALSE
|
||||
*/
|
||||
|
||||
/datum/job/shadekin
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
camp_protection = TRUE
|
||||
|
||||
/datum/job/ai/is_species_banned(species_name, brain_type)
|
||||
// Any species can join as AI, including shadekin.
|
||||
return FALSE
|
||||
// Any species can join as AI, including shadekin.
|
||||
return FALSE
|
||||
|
||||
/datum/job/cyborg/is_species_banned(species_name, brain_type)
|
||||
// Any species can join as cyborgs, including shadekin.
|
||||
return FALSE
|
||||
// Any species can join as cyborgs, including shadekin.
|
||||
return FALSE
|
||||
|
||||
@@ -188,16 +188,16 @@
|
||||
use_power = USE_POWER_IDLE
|
||||
|
||||
/obj/machinery/food_replicator/RefreshParts()
|
||||
var/cap_rating = 0
|
||||
var/man_rating = 0
|
||||
var/cap_rating = 0
|
||||
var/man_rating = 0
|
||||
|
||||
for(var/obj/item/stock_parts/capacitor/C in component_parts)
|
||||
cap_rating += C.rating
|
||||
for(var/obj/item/stock_parts/manipulator/M in component_parts)
|
||||
man_rating += M.rating
|
||||
for(var/obj/item/stock_parts/capacitor/C in component_parts)
|
||||
cap_rating += C.rating
|
||||
for(var/obj/item/stock_parts/manipulator/M in component_parts)
|
||||
man_rating += M.rating
|
||||
|
||||
efficiency = 3 / man_rating
|
||||
speed = cap_rating / 2
|
||||
efficiency = 3 / man_rating
|
||||
speed = cap_rating / 2
|
||||
|
||||
|
||||
/obj/machinery/food_replicator/verb/eject_beaker()
|
||||
|
||||
@@ -161,11 +161,11 @@
|
||||
digest_brute = 0
|
||||
digest_burn = 2
|
||||
struggle_messages_inside = list(
|
||||
"You struggle and squirm, but the walls around you are too soft and pliable, yielding to your every movement without any resistance. Every time you try to push your way out, the walls just squeeze you tighter, reminding you that there's no escape from this warm and cozy prison.",
|
||||
"You search for any signs of an exit, but the walls around you are too thick and plush, absorbing all of your movements without a trace. You're trapped here, at the mercy of their digestive system, slowly melting away in its warm and slimy embrace.",
|
||||
"You press your limbs and body against the soft walls, trying to push your way out. But the walls just close in around you, enveloping you in a tight and suffocating hug. You can feel the warm and slimy digestive juices slowly dissolving your flesh, as you become one with the creature that swallowed you.",
|
||||
"You thrash and flail, trying to break free from the soft and pliable walls that surround you. But every movement just makes the stomach walls pulsate and squeeze tighter around you, coaxing you deeper into the creature's digestive system.",
|
||||
"You try to resist the relentless contractions of the stomach walls, but they're too warm and plush, too soft and pliable. Every movement you make just sends ripples of pleasure throughout the creature's digestive system, making it squeeze and massage you even harder.")
|
||||
"You struggle and squirm, but the walls around you are too soft and pliable, yielding to your every movement without any resistance. Every time you try to push your way out, the walls just squeeze you tighter, reminding you that there's no escape from this warm and cozy prison.",
|
||||
"You search for any signs of an exit, but the walls around you are too thick and plush, absorbing all of your movements without a trace. You're trapped here, at the mercy of their digestive system, slowly melting away in its warm and slimy embrace.",
|
||||
"You press your limbs and body against the soft walls, trying to push your way out. But the walls just close in around you, enveloping you in a tight and suffocating hug. You can feel the warm and slimy digestive juices slowly dissolving your flesh, as you become one with the creature that swallowed you.",
|
||||
"You thrash and flail, trying to break free from the soft and pliable walls that surround you. But every movement just makes the stomach walls pulsate and squeeze tighter around you, coaxing you deeper into the creature's digestive system.",
|
||||
"You try to resist the relentless contractions of the stomach walls, but they're too warm and plush, too soft and pliable. Every movement you make just sends ripples of pleasure throughout the creature's digestive system, making it squeeze and massage you even harder.")
|
||||
belly_fullscreen = "da_tumby"
|
||||
vore_sound = "Stomach Move"
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
icon_state = "tunnel_hole"
|
||||
spawn_types = list(
|
||||
/mob/living/simple_mob/animal/passive/mouse = 100,
|
||||
/mob/living/simple_mob/animal/passive/cockroach = 25,
|
||||
/mob/living/simple_mob/animal/passive/cockroach = 25,
|
||||
/mob/living/simple_mob/animal/passive/mouse/rat/strong = 10, // Because I'm a horrible person. <3
|
||||
/obj/effect/spider/spiderling/non_growing = 5)
|
||||
|
||||
|
||||
@@ -126,9 +126,9 @@
|
||||
name = "Cards Against The Galaxy"
|
||||
keywords += list("Social", "Cards Against The Galaxy", "Games")
|
||||
data = "The idea with Cards Against The Galaxy is that 3 or more players, preferably 4 to 5 players sits with 7 white cards on their hands with random words on them.<br>\
|
||||
One player each round is the 'Card Czar' and draws a black card with a question or phrase, there are one or more blank lines and each player draws cards and lays out secretly for the Czar to read.<br>\
|
||||
The Czar reads them and chooses the combination of the black and white cards that they like best, and the player who put those cards down wins the round and the black card as a point.<br><br>\
|
||||
It's a simple and fun game, far more focused on crew having fun and a good laugh together. Best part is that if a casino staffmember verifies you all played a round, everyone gets 25 chips with the winner of the round getting an additional 25!"
|
||||
One player each round is the 'Card Czar' and draws a black card with a question or phrase, there are one or more blank lines and each player draws cards and lays out secretly for the Czar to read.<br>\
|
||||
The Czar reads them and chooses the combination of the black and white cards that they like best, and the player who put those cards down wins the round and the black card as a point.<br><br>\
|
||||
It's a simple and fun game, far more focused on crew having fun and a good laugh together. Best part is that if a casino staffmember verifies you all played a round, everyone gets 25 chips with the winner of the round getting an additional 25!"
|
||||
|
||||
/datum/lore/codex/page/casinomanual_mechbattle/add_content() //WIP, in future events set up proper mech toy fighting if feature isnt broken
|
||||
name = "Mech Battle Showdown"
|
||||
@@ -138,8 +138,8 @@
|
||||
/datum/lore/codex/category/casinomanual_prizes
|
||||
name = "Prizes"
|
||||
data = "Hey folks, welcome to the prize section! First off I wanna tell you some great news! Nanotransen has gone along with a nice deal that allows crew to occasionally keep their hard earned rewards on station for a limited time,<br>\
|
||||
now you can enjoy your new fancy toolbelt or bluespace beaker for more than just the shift where the casino comes around!<br>\
|
||||
(Be aware, there can be limitations on how many rewards you get to keep after the shift, it might be unfair if some shows up and wins one thing, while they watch as command staff crew with high background income as well as hyperactive miners walks home with 20 prizes they get to enjoy while having almost done no gambling at all.))<br><br>\
|
||||
now you can enjoy your new fancy toolbelt or bluespace beaker for more than just the shift where the casino comes around!<br>\
|
||||
(Be aware, there can be limitations on how many rewards you get to keep after the shift, it might be unfair if some shows up and wins one thing, while they watch as command staff crew with high background income as well as hyperactive miners walks home with 20 prizes they get to enjoy while having almost done no gambling at all.))<br><br>\
|
||||
Lets get to the prizes and exchange rate before we get started on the stuff specifically for the booth operators, so heres the current prizes one can win and their costs! Be aware there might be new prizes or absent ones from time to time!<br>\
|
||||
|
||||
EXCHANGE RATE<br>\
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
//Formally used from a paper, gave this to everyone.
|
||||
/mob/living/carbon/human/verb/create_area()
|
||||
set name = "Create Area"
|
||||
set desc = "Create an area in a enclosed space, making it able to be powered by an APC."
|
||||
set category = "IC.Game"
|
||||
set name = "Create Area"
|
||||
set desc = "Create an area in a enclosed space, making it able to be powered by an APC."
|
||||
set category = "IC.Game"
|
||||
|
||||
if(stat || world.time < last_special)
|
||||
to_chat(usr, span_warning("You recently tried to create an area. Wait a while before using it again."))
|
||||
return
|
||||
if(stat || world.time < last_special)
|
||||
to_chat(usr, span_warning("You recently tried to create an area. Wait a while before using it again."))
|
||||
return
|
||||
|
||||
last_special = world.time + 2 SECONDS // Antispam.
|
||||
create_new_area(usr)
|
||||
return
|
||||
last_special = world.time + 2 SECONDS // Antispam.
|
||||
create_new_area(usr)
|
||||
return
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
/mob/living/simple_mob/vore/greatwolf/Initialize(mapload)
|
||||
. = ..()
|
||||
add_verb(src,/mob/living/simple_mob/proc/pick_color) //CHOMPEdit TGPanel
|
||||
. = ..()
|
||||
add_verb(src,/mob/living/simple_mob/proc/pick_color) //CHOMPEdit TGPanel
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/mob/living/simple_mob/vore/wolf/direwolf/Initialize(mapload)
|
||||
. = ..()
|
||||
add_verb(src,/mob/living/simple_mob/proc/pick_color) //CHOMPEdit TGPanel
|
||||
. = ..()
|
||||
add_verb(src,/mob/living/simple_mob/proc/pick_color) //CHOMPEdit TGPanel
|
||||
/* Combat refactor walkback. 100 old
|
||||
/mob/living/simple_mob/vore/wolf/direwolf
|
||||
maxHealth = 50
|
||||
|
||||
@@ -10,10 +10,10 @@
|
||||
mob.say("[pick("Meow.","*meow","*mrow","*mgeow")]")
|
||||
|
||||
/datum/disease2/effect/choreomania
|
||||
name = "Choreomania"
|
||||
stage = 1
|
||||
chance_maxm = 12
|
||||
var/list/dance = list(2,4,8,2,4,8,2,4,8,2,4,8,1,4,1,4,1,4,2,4,8,2)
|
||||
name = "Choreomania"
|
||||
stage = 1
|
||||
chance_maxm = 12
|
||||
var/list/dance = list(2,4,8,2,4,8,2,4,8,2,4,8,1,4,1,4,1,4,2,4,8,2)
|
||||
|
||||
/datum/disease2/effect/choreomania/activate(mob/living/carbon/mob, multiplier)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user