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

14
maps/RandomZLevels/labyrinth.dm
View File

@@ -202,7 +202,7 @@
corpsesuit = /obj/item/clothing/suit/cultrobes
corpsehelmet = /obj/item/clothing/head/culthood
/mob/living/simple_animal/hostile/tunnelclown
/mob/living/simple_mob/hostile/tunnelclown
name = "tunnel clown"
desc = "A clown driven to madness in the depths of the Honk Mother's Catacombs."
faction = "tunnelclown"
@@ -244,7 +244,7 @@
cold_damage_per_tick = 10
unsuitable_atoms_damage = 10
/mob/living/simple_animal/hostile/tunnelclown/sentinel
/mob/living/simple_mob/hostile/tunnelclown/sentinel
name = "tunnel clown sentinel"
desc = "A clown warrior tasked with guarding the Honk Mother's Catacombs."
faction = "tunnelclown"
@@ -259,7 +259,7 @@
melee_damage_lower = 15
melee_damage_upper = 20
/mob/living/simple_animal/hostile/tunnelclown/death()
/mob/living/simple_mob/hostile/tunnelclown/death()
..()
if(corpse)
new corpse (src.loc)
@@ -268,7 +268,7 @@
del src
return
/mob/living/simple_animal/hostile/cluwne
/mob/living/simple_mob/hostile/cluwne
name = "cluwne"
desc = "A mutated clown alleged to have been cursed by the Honk Mother and permanently banished to these catacombs for once being an unfunny shitter who brought grief instead of laughter."
faction = "tunnelclown"
@@ -316,9 +316,9 @@
icon_state = "clown"
spawn_nothing_percentage = 50
item_to_spawn()
return pick(prob(3);/mob/living/simple_animal/hostile/cluwne,
prob(2);/mob/living/simple_animal/hostile/tunnelclown/sentinel,
prob(1);/mob/living/simple_animal/hostile/tunnelclown)
return pick(prob(3);/mob/living/simple_mob/hostile/cluwne,
prob(2);/mob/living/simple_mob/hostile/tunnelclown/sentinel,
prob(1);/mob/living/simple_mob/hostile/tunnelclown)
/obj/item/weapon/paper/awaygate/labyrinth/calypso
name = "copy of the Final Flight of Calypso"

28
maps/RandomZLevels/snowfield.dm
View File

@@ -17,9 +17,10 @@
power_environ = 0
mobcountmax = 100
floracountmax = 7000
valid_mobs = list(/mob/living/simple_animal/hostile/samak/polar, /mob/living/simple_animal/hostile/diyaab/polar,
/mob/living/simple_animal/hostile/shantak/polar, /mob/living/simple_animal/hostile/bear/polar,
/mob/living/simple_animal/hostile/wolf)
/*
valid_mobs = list(/mob/living/simple_mob/hostile/samak/polar, /mob/living/simple_mob/hostile/diyaab/polar,
/mob/living/simple_mob/hostile/shantak/polar, /mob/living/simple_mob/hostile/bear/polar,
/mob/living/simple_mob/hostile/wolf)*/ //VORESTATION AI TEMPORARY REMOVAL
valid_flora = list(/obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine,
/obj/structure/flora/tree/dead, /obj/structure/flora/grass/brown, /obj/structure/flora/grass/green,
/obj/structure/flora/grass/both, /obj/structure/flora/bush, /obj/structure/flora/ausbushes/grassybush,
@@ -43,7 +44,7 @@
// -- Mobs -- //
/mob/living/simple_animal/hostile/bear/polar // More aggressive than normal bears so none of that fancy life() stuff.
/mob/living/simple_mob/hostile/bear/polar // More aggressive than normal bears so none of that fancy life() stuff.
name = "polar bear"
desc = "The real question is, why are you examining it, instead of running away?"
icon = 'icons/mob/vore.dmi'
@@ -53,13 +54,14 @@
icon_gib = "bear-gib"
vore_icons = SA_ICON_LIVING
vore_active = 1
say_list_type = /datum/say_list/polar_bear
faction = "polar"
maxHealth = 80
health = 80 // Polar bear will fuck you up.
stop_when_pulled = 0
turns_per_move = 5
//stop_when_pulled = 0 //VORESTATION AI TEMPORARY REMOVAL
//turns_per_move = 5 //VORESTATION AI TEMPORARY REMOVAL
see_in_dark = 6
response_help = "pets"
@@ -71,26 +73,26 @@
minbodytemp = 0
speak_chance = 1
//speak_chance = 1 //VORESTATION AI TEMPORARY REMOVAL
meat_type = /obj/item/weapon/reagent_containers/food/snacks/bearmeat
/datum/say_list/polar_bear
speak = list("RAWR!","Rawr!","GRR!","Growl!")
speak_emote = list("growls", "roars")
emote_hear = list("rawrs","grumbles","grawls")
emote_see = list("stares ferociously", "stomps")
meat_type = /obj/item/weapon/reagent_containers/food/snacks/bearmeat
/mob/living/simple_animal/hostile/bear/polar/death()
/mob/living/simple_mob/hostile/bear/polar/death()
desc = "This bastard sure isn't drinking Space Cola anymore."
..()
/mob/living/simple_animal/hostile/samak/polar
/mob/living/simple_mob/hostile/samak/polar
faction = "polar"
/mob/living/simple_animal/hostile/diyaab/polar
/mob/living/simple_mob/hostile/diyaab/polar
faction = "polar"
/mob/living/simple_animal/hostile/shantak/polar
/mob/living/simple_mob/hostile/shantak/polar
faction = "polar"
// -- Items -- //