cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolves compile errors with the exception of map errors.

Browse Source
This commit is contained in:
Cameron653
2019-01-12 21:09:29 -05:00
parent fb6f5e33ca
commit 9dd973221d
140 changed files with 1223 additions and 1211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/xenobio2/machinery/core_extractor.dm
View File

@@ -12,7 +12,7 @@
anchored = 1
circuit = /obj/item/weapon/circuitboard/slimeextractor
var/inuse
var/mob/living/simple_animal/xeno/slime/occupant = null
var/mob/living/simple_mob/xeno/slime/occupant = null
var/occupiedcolor = "#22FF22"
var/emptycolor = "#FF2222"
var/operatingcolor = "#FFFF22"
@@ -69,11 +69,11 @@
to_chat(user, "<span class='danger'>The core extractor is locked and running, wait for it to finish.</span>")
return
if(!(istype(victim, /mob/living/simple_animal/xeno/slime)))
if(!(istype(victim, /mob/living/simple_mob/xeno/slime)))
to_chat(user, "<span class='danger'>This is not a suitable subject for the core extractor!</span>")
return
var/mob/living/simple_animal/xeno/slime/S = victim
var/mob/living/simple_mob/xeno/slime/S = victim
if(S.is_child)
to_chat(user, "<span class='danger'>This subject is not developed enough for the core extractor!</span>")
return

6
code/modules/xenobio2/machinery/gene_manipulators.dm
View File

@@ -263,7 +263,7 @@
disk_needs_genes = 1
circuit = /obj/item/weapon/circuitboard/biobombarder
var/mob/living/simple_animal/xeno/slime/occupant
var/mob/living/simple_mob/xeno/slime/occupant
/obj/machinery/xenobio/editor/New()
..()
@@ -284,7 +284,7 @@
return
else
if(isxeno(G.affecting))
var/mob/living/simple_animal/xeno/X = G.affecting
var/mob/living/simple_mob/xeno/X = G.affecting
if(do_after(user, 30) && X.Adjacent(src) && user.Adjacent(src) && X.Adjacent(user) && !occupant)
user.drop_from_inventory(G)
X.forceMove(src)
@@ -381,7 +381,7 @@
to_chat(user, "<span class='danger'>The [src] is locked and running, wait for it to finish.</span>")
return
if(!(istype(victim, /mob/living/simple_animal/xeno/slime)) )
if(!(istype(victim, /mob/living/simple_mob/xeno/slime)) )
to_chat(user, "<span class='danger'>This is not a suitable subject for the [src]!</span>")
return

4
code/modules/xenobio2/machinery/injector.dm
View File

@@ -51,7 +51,7 @@
user << "<span class='danger'>The injector is full, empty it first!</span>"
return
if(!(istype(victim, /mob/living/simple_animal/xeno)) && !emagged)
if(!(istype(victim, /mob/living/simple_mob/xeno)) && !emagged)
user << "<span class='danger'>This is not a suitable subject for the injector!</span>"
return
@@ -85,7 +85,7 @@
if(!occupant)
return
if(isxeno(occupant))
var/mob/living/simple_animal/xeno/X = occupant
var/mob/living/simple_mob/xeno/X = occupant
beaker.reagents.trans_to_holder(X.reagents, computer.transfer_amount, 1, 0)
else
beaker.reagents.trans_to_mob(occupant, computer.transfer_amount)

2
code/modules/xenobio2/machinery/injector_computer.dm
View File

@@ -59,7 +59,7 @@
if(injector.occupant)
data["occupied"] = 1
if(isxeno(injector.occupant))
var/mob/living/simple_animal/xeno/X = injector.occupant
var/mob/living/simple_mob/xeno/X = injector.occupant
data["compatible"] = 1
data["instability"] = 100 * (X.mut_level / X.mut_max)
else

2
code/modules/xenobio2/machinery/slime_replicator.dm
View File

@@ -71,7 +71,7 @@
update_light_color()
icon_state = "restruct_1"
spawn(30)
var/mob/living/simple_animal/xeno/slime/S = new(src)
var/mob/living/simple_mob/xeno/slime/S = new(src)
S.traitdat = new() //New instance, so that if the core is deleted, the slime retains a trait datum.
S.nameVar = core.nameVar
S.name = "[S.nameVar] baby slime"

14
code/modules/xenobio2/mob/slime/slime life.dm
View File

@@ -3,7 +3,7 @@ Slime specific life events go here.
*/
#define HAPPYLEVEL 200
#define ANGRYLEVEL 10
/mob/living/simple_animal/xeno/slime/Life()
/mob/living/simple_mob/xeno/slime/Life()
. = ..()
if(..())
if(health)
@@ -15,8 +15,8 @@ Slime specific life events go here.
growthcounter--
if(growthcounter >= growthpoint)
src.GrowUp()
else
else
if(nutrition < 0)
nutrition = 0
if((prob(10) && !emote_on)) //Slimes might display their food-based emotions over time.
@@ -28,7 +28,7 @@ Slime specific life events go here.
I.icon_state = "aslime-:33"
else
I.icon_state = "aslime-:3"
else if((nutrition > ANGRYLEVEL))
if((nutrition >= 10 * ANGRYLEVEL))
I.icon_state = "aslime-pout"
@@ -41,7 +41,7 @@ Slime specific life events go here.
spawn(30)
GenerateAdultIcon()
emote_on = null
else
if(is_child)
icon_state = "slime baby dead"
@@ -49,7 +49,7 @@ Slime specific life events go here.
overlays.Cut()
icon_state = "slime adult dead"
color = traitdat.traits[TRAIT_XENO_COLOR]
return 0 //Everything worked okay
return //xeno/Life() returned 0.

43
code/modules/xenobio2/mob/slime/slime procs.dm
View File

@@ -2,10 +2,10 @@
Slime specific procs go here.
*/
#define SHINYOVERLAY 0
#define LIGHTOVERLAY 1
#define LIGHTOVERLAY 1
#define MAXOVERLAY 2 //Should be 1 + last overlay, to give the chance for matte slimes
/mob/living/simple_animal/xeno/slime/RandomizeTraits()
/mob/living/simple_mob/xeno/slime/RandomizeTraits()
traitdat.traits[TRAIT_XENO_COLDRES] = rand(30,270)
traitdat.traits[TRAIT_XENO_HEATRES] = rand(30,270)
traitdat.traits[TRAIT_XENO_CHEMVOL] = round(rand(20,40)) //Wow, a slime core with the capacity to hold 2/3rd's a beaker's worth of chemicals.
@@ -23,8 +23,8 @@ Slime specific procs go here.
traitdat.traits[TRAIT_XENO_STR_RANGE] =round(rand(0,2))
traitdat.traits[TRAIT_XENO_CANLEARN] = prob(68)
traitdat.traits[TRAIT_XENO_SPEED] = round(rand(-10,10))
/mob/living/simple_animal/xeno/slime/RandomChemicals()
/mob/living/simple_mob/xeno/slime/RandomChemicals()
..()
if(prob(40))
var/hasMutToxin
@@ -34,7 +34,7 @@ Slime specific procs go here.
var/chemamount
if(hasMutToxin)
var/list/chemchoices = (xenoChemList - traitdat.chems)
var/chemtype = pick(chemchoices)
chemamount = rand(1,5)
traitdat.chems[chemtype] = chemamount
@@ -42,16 +42,16 @@ Slime specific procs go here.
chemamount = rand(1,5)
traitdat.chems["mutationtoxin"] = chemamount
/mob/living/simple_animal/xeno/slime/proc/GrowUp()
/mob/living/simple_mob/xeno/slime/proc/GrowUp()
GenerateAdult()
maxHealth = traitdat.get_trait(TRAIT_XENO_HEALTH)
health = maxHealth
is_child = 0
return 1
/mob/living/simple_animal/xeno/slime/Mutate()
/mob/living/simple_mob/xeno/slime/Mutate()
..()
cores = round(rand(1,9))
if(is_child)
@@ -59,8 +59,8 @@ Slime specific procs go here.
GenerateChild()
else
GenerateAdult()
/mob/living/simple_animal/xeno/slime/proc/GenerateChild()
/mob/living/simple_mob/xeno/slime/proc/GenerateChild()
overlays.Cut()
name = "[nameVar] baby slime"
real_name = "[nameVar] baby slime"
@@ -71,10 +71,10 @@ Slime specific procs go here.
color = traitdat.traits[TRAIT_XENO_COLOR]
maxHealth = traitdat.traits[TRAIT_XENO_HEALTH]/2
health = maxHealth
return 1
/mob/living/simple_animal/xeno/slime/proc/GenerateAdult()
/mob/living/simple_mob/xeno/slime/proc/GenerateAdult()
overlays.Cut()
name = "[nameVar] slime"
real_name = "[nameVar] slime"
@@ -83,15 +83,15 @@ Slime specific procs go here.
icon_state = ""
overlay = round(rand(0, MAXOVERLAY))
GenerateAdultIcon()
/mob/living/simple_animal/xeno/slime/proc/GenerateAdultIcon() //Hack and slash adventure game to make slimes have no color on light effects later
/mob/living/simple_mob/xeno/slime/proc/GenerateAdultIcon() //Hack and slash adventure game to make slimes have no color on light effects later
overlays.Cut()
var/image/Img = new(src.icon)
Img.icon_state = "slime adult"
Img.color = traitdat.traits[TRAIT_XENO_COLOR]
Img.layer = src.layer
overlays += Img
switch(overlay)
if(SHINYOVERLAY)
var/image/I = new(src.icon)
@@ -109,7 +109,7 @@ Slime specific procs go here.
I.color = "#FFFFFF"
overlays += I
/mob/living/simple_animal/xeno/slime/handle_reagents()
/mob/living/simple_mob/xeno/slime/handle_reagents()
if(!stasis)
if(!reagents)
return
@@ -119,11 +119,10 @@ Slime specific procs go here.
hostile = 0
traitdat.traits[TRAIT_XENO_HOSTILE] = 0
..()
/mob/living/simple_animal/xeno/slime/ProcessTraits()
/mob/living/simple_mob/xeno/slime/ProcessTraits()
..()
if(is_child)
GenerateChild()
else
GenerateAdult()

4
code/modules/xenobio2/mob/slime/slime.dm
View File

@@ -1,7 +1,7 @@
/*
Slime definitions, Life and New live here.
*/
/mob/living/simple_animal/xeno/slime //Adult values are found here
/mob/living/simple_mob/xeno/slime //Adult values are found here
nameVar = "grey" //When mutated, nameVar might change.
desc = "A shifting, mass of goo."
faction = "slime"
@@ -80,7 +80,7 @@ Slime definitions, Life and New live here.
"woodpulp" = list("heal" = 0.1, "nutr" = 0.7),
"docilitytoxin" = list("nutr" = 0.3) )
/mob/living/simple_animal/xeno/slime/New()
/mob/living/simple_mob/xeno/slime/New()
..()
for(var/datum/language/L in (typesof(/datum/language) - /datum/language))
languages += L

22
code/modules/xenobio2/mob/xeno procs.dm
View File

@@ -8,7 +8,7 @@ Procs for copying speech, if applicable
Procs for targeting
Divergence proc, used in mutation to make unique datums.
*/
/mob/living/simple_animal/xeno/proc/ProcessTraits()
/mob/living/simple_mob/xeno/proc/ProcessTraits()
if(maleable >= MAX_MALEABLE)
maxHealth = traitdat.get_trait(TRAIT_XENO_HEALTH)
health = maxHealth
@@ -46,7 +46,7 @@ Divergence proc, used in mutation to make unique datums.
//Metabolism proc, simplified for xenos. Heavily based on botanical metabolism.
/mob/living/simple_animal/xeno/proc/handle_reagents()
/mob/living/simple_mob/xeno/proc/handle_reagents()
if(!stasis)
if(!reagents)
return
@@ -85,13 +85,13 @@ Divergence proc, used in mutation to make unique datums.
return 1 //Everything worked out okay.
return 0
/mob/living/simple_animal/xeno/proc/diverge()
/mob/living/simple_mob/xeno/proc/diverge()
var/datum/xeno/traits/newtraits = new()
newtraits.copy_traits(traitdat)
return newtraits
/mob/living/simple_animal/xeno/proc/Mutate()
/mob/living/simple_mob/xeno/proc/Mutate()
traitdat = diverge()
nameVar = "mutated"
if((COLORMUT & mutable))
@@ -109,10 +109,10 @@ Divergence proc, used in mutation to make unique datums.
ProcessTraits()
return 1
/mob/living/simple_animal/xeno/proc/RandomizeTraits()
/mob/living/simple_mob/xeno/proc/RandomizeTraits()
return
/mob/living/simple_animal/xeno/hear_say(var/message, var/verb = "says", var/datum/language/language, var/alt_name = "",var/italics = 0, var/mob/speaker = null)
/mob/living/simple_mob/xeno/hear_say(var/message, var/verb = "says", var/datum/language/language, var/alt_name = "",var/italics = 0, var/mob/speaker = null)
if(traitdat.traits[TRAIT_XENO_CANLEARN])
/*
Until this gets sorted out to a functioning point, or waiting on Psi's saycode update.
@@ -130,7 +130,7 @@ Divergence proc, used in mutation to make unique datums.
speech_buffer.Add(message)
..(message,verb,language,alt_name,italics,speaker)
/mob/living/simple_animal/xeno/proc/ProcessSpeechBuffer()
/mob/living/simple_mob/xeno/proc/ProcessSpeechBuffer()
if(speech_buffer.len)
if(prob(traitdat.get_trait(TRAIT_XENO_LEARNCHANCE)) && traitdat.get_trait(TRAIT_XENO_CANLEARN))
var/chosen = pick(speech_buffer)
@@ -140,10 +140,10 @@ Divergence proc, used in mutation to make unique datums.
log_debug("Speechlist cut.") */
speech_buffer.Cut()
//
/mob/living/simple_animal/xeno/proc/BuildReagentLists()
/mob/living/simple_mob/xeno/proc/BuildReagentLists()
return
/mob/living/simple_animal/xeno/bullet_act(var/obj/item/projectile/P)
/mob/living/simple_mob/xeno/bullet_act(var/obj/item/projectile/P)
//Shamelessly stolen from ablative armor.
if((traitdat.traits[TRAIT_XENO_CHROMATIC]) && istype(P, /obj/item/projectile/beam))
visible_message("<span class='danger'>)\The beam reflects off of the [src]!</span>")
@@ -161,7 +161,7 @@ Divergence proc, used in mutation to make unique datums.
else
..()
/mob/living/simple_animal/xeno/proc/RandomChemicals()
/mob/living/simple_mob/xeno/proc/RandomChemicals()
traitdat.chems.Cut() //Clear the amount first.
var/num_chems = round(rand(1,4))

10
code/modules/xenobio2/mob/xeno.dm
View File

@@ -5,7 +5,7 @@ Basic definition of creatures for Xenobiology
Also includes Life and New
*/
/mob/living/simple_animal/xeno
/mob/living/simple_mob/xeno
name = "Xeno"
real_name = "Xeno"
faction = "xeno" //Needs to be set.
@@ -46,7 +46,7 @@ Also includes Life and New
//Life additions
/mob/living/simple_animal/xeno/Life()
/mob/living/simple_mob/xeno/Life()
if(stasis)
stasis--
if(stasis < 0)
@@ -74,7 +74,7 @@ Also includes Life and New
return 1 //Everything worked okay.
/mob/living/simple_animal/xeno/New()
/mob/living/simple_mob/xeno/New()
traitdat = new()
@@ -95,13 +95,13 @@ Also includes Life and New
if(!health)
stat = DEAD
/mob/living/simple_animal/xeno/bullet_act(var/obj/item/projectile/Proj)
/mob/living/simple_mob/xeno/bullet_act(var/obj/item/projectile/Proj)
if(istype(Proj, /obj/item/projectile/beam/stun/xeno))
var/obj/item/projectile/beam/stun/xeno/hit = Proj
stasis += hit.stasisforce
..()
/mob/living/simple_animal/xeno/Destroy()
/mob/living/simple_mob/xeno/Destroy()
traitdat.Destroy() //Let's clean up after ourselves.
traitdat = null
..()

24
code/modules/xenobio2/tools/xeno_trait_scanner.dm
View File

@@ -45,15 +45,15 @@
var/growth_max
if(istype(target,/obj/structure/table))
return ..()
else if(istype(target,/mob/living/simple_animal/xeno))
else if(istype(target,/mob/living/simple_mob/xeno))
var/mob/living/simple_animal/xeno/X = target
if(istype(X, /mob/living/simple_animal/xeno/slime))
var/mob/living/simple_animal/xeno/slime/S = X
var/mob/living/simple_mob/xeno/X = target
if(istype(X, /mob/living/simple_mob/xeno/slime))
var/mob/living/simple_mob/xeno/slime/S = X
if(S.is_child)
growth_level = S.growthcounter
growth_max = S.growthpoint
targetName = X.name
trait_info = X.traitdat
@@ -109,7 +109,7 @@
dat += "It bears characteristics that indicate susceptibility to damage.<br>"
else
dat += "It bears no characters indicating resilience to damage.<br>"
if(growth_max)
if(growth_level < 35)
dat += "It appears to be far to growing up.<br>"
@@ -137,7 +137,7 @@
dat += "It appears to be agile.<br>"
else if(trait_info.get_trait(TRAIT_XENO_SPEED) > 0)
dat += "It appears to be slower.<br>"
if(trait_info.get_trait(TRAIT_XENO_CANSPEAK))
dat += "<br>The subject appears to be able to articulate."
@@ -149,18 +149,18 @@
if(trait_info.get_trait(TRAIT_XENO_CANLEARN))
dat += "<br>The subject appears to have process verbal information."
if(trait_info.get_trait(TRAIT_XENO_LEARNCHANCE))
if(trait_info.get_trait(TRAIT_XENO_LEARNCHANCE) < 50)
dat += "The subject appears to comprehend verbal information infrequently.<br>"
else if(trait_info.get_trait(TRAIT_XENO_LEARNCHANCE) > 51)
dat += "The subject appears to comprehend verbal information frequently.<br>"
if(trait_info.get_trait(TRAIT_XENO_STRENGTH) < 5)
dat += "It appears to have lower average physical capacity.<br>"
else if(trait_info.get_trait(TRAIT_XENO_STRENGTH) > 7)
dat += "It appears to have greater average physical capacity.<br>"
if(trait_info.get_trait(TRAIT_XENO_STR_RANGE))
if(trait_info.get_trait(TRAIT_XENO_STR_RANGE) < 50)
dat += "The subject appears to have more consistent attacks.<br>"
@@ -172,11 +172,11 @@
if(trait_info.get_trait(TRAIT_XENO_HOSTILE))
dat += "<br>The subject appears to have hostile tendencies."
if(trait_info.get_trait(TRAIT_XENO_CHROMATIC))
dat += "<br>The subject appears to have chromatic particles inside of it."
if(dat)
last_data = dat
dat += "<br><br>\[<a href='?src=\ref[src];print=1'>print report</a>\]"