mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-01-02 05:23:31 +00:00
Adding CHOMPedit to edited lines and files, with brief descriptions.
Can't believe I didn't think of doing this already.
This commit is contained in:
@@ -6,4 +6,4 @@ GLOBAL_LIST_EMPTY(directory) //all ckeys with associated client
|
||||
GLOBAL_LIST_EMPTY(clients)
|
||||
GLOBAL_LIST_EMPTY(players_by_zlevel)
|
||||
GLOBAL_LIST_EMPTY(round_text_log)
|
||||
GLOBAL_LIST_EMPTY(ghost_mob_list) //List of all ghosts, including clientless. Excludes /mob/new_player
|
||||
GLOBAL_LIST_EMPTY(ghost_mob_list) //CHOMPedit List of all ghosts, including clientless. Excludes /mob/new_player
|
||||
|
||||
@@ -229,7 +229,7 @@ var/list/gamemode_cache = list()
|
||||
// 15, 45, 70 minutes respectively
|
||||
var/static/list/event_delay_upper = list(EVENT_LEVEL_MUNDANE = 9000, EVENT_LEVEL_MODERATE = 27000, EVENT_LEVEL_MAJOR = 42000)
|
||||
|
||||
var/static/aliens_allowed = 1 //This not only allows the natural spawning of xenos, but also the ability to lay eggs. Xenomorphs cannot lay eggs if this is 0
|
||||
var/static/aliens_allowed = 1 //CHOMPedit to 1. This not only allows the natural spawning of xenos, but also the ability to lay eggs. Xenomorphs cannot lay eggs if this is 0
|
||||
var/static/ninjas_allowed = 0
|
||||
var/static/abandon_allowed = 1
|
||||
var/static/ooc_allowed = 1
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#define MAX_PROGRESS 100
|
||||
|
||||
/obj/structure/alien/egg
|
||||
/obj/structure/alien/egg //CHOMPedit this entire file is a CHOMPedit
|
||||
desc = "It looks like a weird egg."
|
||||
name = "egg"
|
||||
icon_state = "egg_growing"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/obj/structure/alien
|
||||
/obj/structure/alien ////CHOMPedit This entire file is a CHOMPedit, for new eggs
|
||||
name = "alien thing"
|
||||
desc = "There's something alien about this."
|
||||
icon = 'icons/mob/alien.dmi'
|
||||
|
||||
@@ -419,3 +419,5 @@
|
||||
if(0 to 1)
|
||||
visible_message("<span class='alium'>[src.target] begins to crumble under the acid!</span>")
|
||||
spawn(rand(150, 200)) tick()
|
||||
|
||||
//CHOMPedit old eggs removed
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
/mob/living/carbon/alien/u_equip(obj/item/W as obj)
|
||||
return
|
||||
|
||||
/*/mob/living/carbon/alien/Stat() //Commented out because this doesn't work properly for larva, when it should. Will probably give Diona their own kind of they don't have one
|
||||
/*/mob/living/carbon/alien/Stat() //CHOMPedit. Commented out because this doesn't work properly for larva, when it should. Will probably give Diona their own kind of they don't have one
|
||||
..()
|
||||
stat(null, "Progress: [amount_grown]/[max_grown]") */
|
||||
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
speak_emote = list("hisses")
|
||||
icon_state = "larva"
|
||||
language = "Hivemind"
|
||||
maxHealth = 50 //Larva can gain a little more health on weeds/phoron to make them just a little harder to kill
|
||||
maxHealth = 50 //CHOMPedit. Larva can gain a little more health on weeds/phoron to make them just a little harder to kill
|
||||
health = 25
|
||||
faction = "xeno"
|
||||
max_grown = 325 //Since xenos can reproduce without people now I decided to drastically increase the growth time
|
||||
max_grown = 325 //CHOMPedit. Since xenos can reproduce without people now I decided to drastically increase the growth time
|
||||
|
||||
/mob/living/carbon/alien/larva/Initialize()
|
||||
. = ..()
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/mob/living/carbon/alien/larva/Stat() //Oh thank god we can see how close we are to full grown now
|
||||
/mob/living/carbon/alien/larva/Stat() //CHOMPedit. Oh thank god we can see how close we are to full grown now
|
||||
. = ..()
|
||||
if(. && statpanel("Status"))
|
||||
stat("Growth", "[round(amount_grown)]/[max_grown]")
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
var/rads = radiation/25
|
||||
radiation -= rads
|
||||
/*adjust_nutrition(rads)*/ //Commented out to prevent xeno/diona obesity, it was a real problem
|
||||
/*adjust_nutrition(rads)*/ //CHOMPedit. Commented out to prevent xeno/diona obesity, it was a real problem
|
||||
heal_overall_damage(rads,rads)
|
||||
adjustOxyLoss(-(rads))
|
||||
adjustToxLoss(-(rads))
|
||||
|
||||
@@ -1192,7 +1192,7 @@
|
||||
maxHealth = species.total_health
|
||||
hunger_rate = species.hunger_factor //VOREStation Add
|
||||
|
||||
default_pixel_x = initial(pixel_x) + species.pixel_offset_x
|
||||
default_pixel_x = initial(pixel_x) + species.pixel_offset_x //CHOMPedit for giving datum/species ways to change 64x64 sprite offsets
|
||||
default_pixel_y = initial(pixel_y) + species.pixel_offset_y
|
||||
pixel_x = default_pixel_x
|
||||
pixel_y = default_pixel_y
|
||||
|
||||
@@ -18,8 +18,8 @@
|
||||
var/fire_icon_state = "humanoid" // The icon_state used inside OnFire.dmi for when on fire.
|
||||
var/suit_storage_icon = 'icons/mob/belt_mirror.dmi' // Icons used for worn items in suit storage slot.
|
||||
|
||||
var/pixel_offset_x = 0 // Used for offsetting large icons.
|
||||
var/pixel_offset_y = 0 // Used for offsetting large icons.
|
||||
var/pixel_offset_x = 0 // CHOMPedit. Used for offsetting 64x64 and up icons.
|
||||
var/pixel_offset_y = 0 // CHOMPedit. Used for offsetting 64x64 and up icons.
|
||||
|
||||
// Damage overlay and masks.
|
||||
var/damage_overlays = 'icons/mob/human_races/masks/dam_human.dmi'
|
||||
|
||||
@@ -88,13 +88,13 @@
|
||||
verbs -= /mob/living/carbon/human/proc/lay_egg
|
||||
return
|
||||
|
||||
if(locate(/obj/structure/alien/egg) in get_turf(src))
|
||||
if(locate(/obj/structure/alien/egg) in get_turf(src)) //CHOMPedit. Changed from obj/effect to obj/structure
|
||||
to_chat(src, "There's already an egg here.")
|
||||
return
|
||||
|
||||
if(check_alien_ability(75,1,O_EGG))
|
||||
visible_message("<span class='alium'><B>[src] has laid an egg!</B></span>")
|
||||
new /obj/structure/alien/egg(loc)
|
||||
new /obj/structure/alien/egg(loc) //CHOMPedit. Changed from obj/effect to obj/structure
|
||||
|
||||
return
|
||||
|
||||
|
||||
@@ -10,19 +10,19 @@
|
||||
hud_type = /datum/hud_data/alien
|
||||
rarity_value = 3
|
||||
|
||||
darksight = 10
|
||||
darksight = 10 //CHOMPedit. Added darksight
|
||||
|
||||
pixel_offset_x = -16 //I literally had to make a different form of pixel_x just for this species, fuck my life
|
||||
pixel_offset_x = -16 //CHOMPedit. I literally had to make a different form of pixel_x just for this species, fuck my life
|
||||
|
||||
|
||||
icon_template = 'icons/mob/human_races/xenos/template.dmi'
|
||||
icon_template = 'icons/mob/human_races/xenos/template.dmi' //CHOMPedit. Add icon template for 64x64 sprites
|
||||
|
||||
has_fine_manipulation = 0
|
||||
siemens_coefficient = 0
|
||||
gluttonous = 2
|
||||
|
||||
brute_mod = 0.65 // Hardened carapace.
|
||||
burn_mod = 1.50 // Weak to fire.
|
||||
brute_mod = 0.65 //CHOMPedit. Edited brute vulnerability
|
||||
burn_mod = 1.50 //CHOMPedit. Edited burn vulnerability
|
||||
|
||||
warning_low_pressure = 50
|
||||
hazard_low_pressure = -1
|
||||
@@ -40,12 +40,12 @@
|
||||
flesh_color = "#282846"
|
||||
gibbed_anim = "gibbed-a"
|
||||
dusted_anim = "dust-a"
|
||||
death_message = "lets out a piercing multi-toned screech, green blood bubbling from its maw as it ceases."
|
||||
death_message = "lets out a piercing multi-toned screech, green blood bubbling from its maw as it ceases." //CHOMPedit. Changed message.
|
||||
death_sound = 'sound/voice/hiss6.ogg'
|
||||
|
||||
damage_overlays = null //They don't have overlays yet, if someone wants to add some then be my guest
|
||||
damage_mask = null
|
||||
blood_mask = null
|
||||
damage_overlays = null //CHOMPedit. They don't have overlays yet, if someone wants to add some then be my guest
|
||||
damage_mask = null //CHOMPedit.
|
||||
blood_mask = null //CHOMPedit.
|
||||
|
||||
speech_sounds = list('sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg')
|
||||
speech_chance = 100
|
||||
@@ -103,7 +103,7 @@
|
||||
|
||||
/datum/species/xenos/hug(var/mob/living/carbon/human/H,var/mob/living/target)
|
||||
H.visible_message("<span class='notice'>[H] caresses [target] with its eldritch arm.</span>", \
|
||||
"<span class='notice'>You caress [target] with your eldritch arm.</span>")
|
||||
"<span class='notice'>You caress [target] with your eldritch arm.</span>") //CHOMPedit. Changed messages
|
||||
|
||||
/datum/species/xenos/handle_post_spawn(var/mob/living/carbon/human/H)
|
||||
|
||||
@@ -180,7 +180,7 @@
|
||||
caste_name = "drone"
|
||||
weeds_plasma_rate = 15
|
||||
slowdown = 1
|
||||
tail = null
|
||||
tail = null //CHOMPedit. Set to null
|
||||
rarity_value = 5
|
||||
|
||||
icobase = 'icons/mob/human_races/xenos/r_xenos_drone.dmi'
|
||||
@@ -221,7 +221,7 @@
|
||||
caste_name = "hunter"
|
||||
slowdown = -2
|
||||
total_health = 150
|
||||
tail = null
|
||||
tail = null //CHOMPedit. Set to null
|
||||
|
||||
icobase = 'icons/mob/human_races/xenos/r_xenos_hunter.dmi'
|
||||
deform = 'icons/mob/human_races/xenos/r_xenos_hunter.dmi'
|
||||
@@ -251,7 +251,7 @@
|
||||
caste_name = "sentinel"
|
||||
slowdown = 0
|
||||
total_health = 200
|
||||
tail = null
|
||||
tail = null //CHOMPedit. Set to null
|
||||
|
||||
icobase = 'icons/mob/human_races/xenos/r_xenos_sentinel.dmi'
|
||||
deform = 'icons/mob/human_races/xenos/r_xenos_sentinel.dmi'
|
||||
@@ -280,12 +280,12 @@
|
||||
/datum/species/xenos/queen
|
||||
|
||||
name = SPECIES_XENO_QUEEN
|
||||
total_health = 300 //Queen is chonk
|
||||
total_health = 300 //CHOMPedit. Queen is chonk
|
||||
weeds_heal_rate = 5
|
||||
weeds_plasma_rate = 20
|
||||
caste_name = "queen"
|
||||
slowdown = 4
|
||||
tail = null
|
||||
tail = null //CHOMPedit. Set to null
|
||||
rarity_value = 10
|
||||
|
||||
icobase = 'icons/mob/human_races/xenos/r_xenos_queen.dmi'
|
||||
|
||||
@@ -27,3 +27,5 @@ proc/create_new_xenomorph(var/alien_caste,var/target)
|
||||
faction = "xeno"
|
||||
..(new_loc, SPECIES_XENO_QUEEN)
|
||||
|
||||
//CHOMPedit. Removed AddInfectionImages code, due to it being commented out and not used
|
||||
|
||||
|
||||
@@ -213,4 +213,3 @@
|
||||
cannot_amputate = 1
|
||||
thick_skin = TRUE
|
||||
eye_icon = "blank_eyes"
|
||||
var/vision_flags = SEE_MOBS|SEE_TURFS
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
return 0
|
||||
return affected && affected.open == (affected.encased ? 3 : 2)
|
||||
|
||||
//CHOMPedit. Removed unused embryo surgery
|
||||
|
||||
//////////////////////////////////////////////////////////////////
|
||||
// CHEST INTERNAL ORGAN SURGERY //
|
||||
|
||||
Reference in New Issue
Block a user