cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +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

45
code/modules/admin/verbs/smite_vr.dm
View File

@@ -18,6 +18,7 @@
feedback_add_details("admin_verb","SMITEV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
switch(smite_choice)
/*
if(SMITE_SHADEKIN_ATTACK)
var/turf/Tt = get_turf(target) //Turf for target
@@ -34,7 +35,7 @@
if(!Ts)
return //Didn't find shadekin spawn turf
var/mob/living/simple_animal/shadekin/red/shadekin = new(Ts)
var/mob/living/simple_mob/shadekin/red/shadekin = new(Ts)
//Abuse of shadekin
shadekin.real_name = shadekin.name
shadekin.init_vore()
@@ -47,29 +48,29 @@
//Remove when done
spawn(10 SECONDS)
if(shadekin)
shadekin.death()
shadekin.death()*/ //VORESTATION AI TEMPORARY REMOVAL
/*if(SMITE_SHADEKIN_NOMF)
var/list/kin_types = list(
"Red Eyes (Dark)" = /mob/living/simple_animal/shadekin/red/dark,
"Red Eyes (Light)" = /mob/living/simple_animal/shadekin/red/white,
"Red Eyes (Brown)" = /mob/living/simple_animal/shadekin/red/brown,
"Blue Eyes (Dark)" = /mob/living/simple_animal/shadekin/blue/dark,
"Blue Eyes (Light)" = /mob/living/simple_animal/shadekin/blue/white,
"Blue Eyes (Brown)" = /mob/living/simple_animal/shadekin/blue/brown,
"Purple Eyes (Dark)" = /mob/living/simple_animal/shadekin/purple/dark,
"Purple Eyes (Light)" = /mob/living/simple_animal/shadekin/purple/white,
"Purple Eyes (Brown)" = /mob/living/simple_animal/shadekin/purple/brown,
"Yellow Eyes (Dark)" = /mob/living/simple_animal/shadekin/yellow/dark,
"Yellow Eyes (Light)" = /mob/living/simple_animal/shadekin/yellow/white,
"Yellow Eyes (Brown)" = /mob/living/simple_animal/shadekin/yellow/brown,
"Green Eyes (Dark)" = /mob/living/simple_animal/shadekin/green/dark,
"Green Eyes (Light)" = /mob/living/simple_animal/shadekin/green/white,
"Green Eyes (Brown)" = /mob/living/simple_animal/shadekin/green/brown,
"Orange Eyes (Dark)" = /mob/living/simple_animal/shadekin/orange/dark,
"Orange Eyes (Light)" = /mob/living/simple_animal/shadekin/orange/white,
"Orange Eyes (Brown)" = /mob/living/simple_animal/shadekin/orange/brown,
"Rivyr (Unique)" = /mob/living/simple_animal/shadekin/blue/rivyr)
"Red Eyes (Dark)" = /mob/living/simple_mob/shadekin/red/dark,
"Red Eyes (Light)" = /mob/living/simple_mob/shadekin/red/white,
"Red Eyes (Brown)" = /mob/living/simple_mob/shadekin/red/brown,
"Blue Eyes (Dark)" = /mob/living/simple_mob/shadekin/blue/dark,
"Blue Eyes (Light)" = /mob/living/simple_mob/shadekin/blue/white,
"Blue Eyes (Brown)" = /mob/living/simple_mob/shadekin/blue/brown,
"Purple Eyes (Dark)" = /mob/living/simple_mob/shadekin/purple/dark,
"Purple Eyes (Light)" = /mob/living/simple_mob/shadekin/purple/white,
"Purple Eyes (Brown)" = /mob/living/simple_mob/shadekin/purple/brown,
"Yellow Eyes (Dark)" = /mob/living/simple_mob/shadekin/yellow/dark,
"Yellow Eyes (Light)" = /mob/living/simple_mob/shadekin/yellow/white,
"Yellow Eyes (Brown)" = /mob/living/simple_mob/shadekin/yellow/brown,
"Green Eyes (Dark)" = /mob/living/simple_mob/shadekin/green/dark,
"Green Eyes (Light)" = /mob/living/simple_mob/shadekin/green/white,
"Green Eyes (Brown)" = /mob/living/simple_mob/shadekin/green/brown,
"Orange Eyes (Dark)" = /mob/living/simple_mob/shadekin/orange/dark,
"Orange Eyes (Light)" = /mob/living/simple_mob/shadekin/orange/white,
"Orange Eyes (Brown)" = /mob/living/simple_mob/shadekin/orange/brown,
"Rivyr (Unique)" = /mob/living/simple_mob/shadekin/blue/rivyr)
var/kin_type = input("Select the type of shadekin for [target] nomf","Shadekin Type Choice") as null|anything in kin_types
if(!kin_type || !target)
return
@@ -88,7 +89,7 @@
//Begin abuse
target.transforming = TRUE //Cheap hack to stop them from moving
var/mob/living/simple_animal/shadekin/shadekin = new kin_type(Tt)
var/mob/living/simple_mob/shadekin/shadekin = new kin_type(Tt)
shadekin.real_name = shadekin.name
shadekin.init_vore()
shadekin.can_be_drop_pred = TRUE