cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +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"