From d15ce2c40d0dbf0ee6e4eaef630943f025e52cb3 Mon Sep 17 00:00:00 2001 From: "kortgstation@gmail.com" Date: Thu, 10 May 2012 05:33:01 +0000 Subject: [PATCH] Fixed Summon Guns spawning broken eguns. Replaced the decloner and freezegun with aegun and mateba (for list of possible guns). Added Ausops gateway sprite. Added placeholder structures so the people working on the map have something to mark where the recieving gate will be. And unfinished Behemoth code because the dme needed to be updated to include Ausops stuff. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3572 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/wizard/rightandwrong.dm | 12 +- code/game/machinery/gateway.dm | 49 ++++++++ code/modules/mob/simple_animal/behemoth.dm | 126 ++++++++++++++++++++ icons/obj/gate.dmi | 0 icons/obj/machines/gateway.dmi | Bin 0 -> 18301 bytes tgstation.dme | 2 + 6 files changed, 183 insertions(+), 6 deletions(-) create mode 100644 code/game/machinery/gateway.dm create mode 100644 code/modules/mob/simple_animal/behemoth.dm create mode 100644 icons/obj/gate.dmi create mode 100644 icons/obj/machines/gateway.dmi diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index 2d72f5c452..4db15b0553 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -19,20 +19,20 @@ for(var/datum/objective/OBJ in H.mind.objectives) H << "Objective #[obj_count]: [OBJ.explanation_text]" obj_count++ - var/randomize = pick("taser","egun","laser","revolver","smg","decloner","deagle","gyrojet","pulse","silenced","cannon","shotgun","freeze","uzi","crossbow") + var/randomize = pick("taser","egun","laser","revolver","smg","nuclear","deagle","gyrojet","pulse","silenced","cannon","shotgun","mateba","uzi","crossbow") switch (randomize) if("taser") new /obj/item/weapon/gun/energy/taser(get_turf(H)) if("egun") - new /obj/item/weapon/gun/energy(get_turf(H)) + new /obj/item/weapon/gun/energy/gun(get_turf(H)) if("laser") new /obj/item/weapon/gun/energy/laser(get_turf(H)) if("revolver") new /obj/item/weapon/gun/projectile(get_turf(H)) if("smg") new /obj/item/weapon/gun/projectile/automatic/c20r(get_turf(H)) - if("decloner") - new /obj/item/weapon/gun/energy/decloner(get_turf(H)) + if("nuclear") + new /obj/item/weapon/gun/energy/gun/nuclear(get_turf(H)) if("deagle") new /obj/item/weapon/gun/projectile/deagle/camo(get_turf(H)) if("gyrojet") @@ -45,8 +45,8 @@ new /obj/item/weapon/gun/energy/lasercannon(get_turf(H)) if("shotgun") new /obj/item/weapon/gun/projectile/shotgun/pump/combat(get_turf(H)) - if("freeze") - new /obj/item/weapon/gun/energy/temperature(get_turf(H)) + if("mateba") + new /obj/item/weapon/gun/projectile/mateba(get_turf(H)) if("uzi") new /obj/item/weapon/gun/projectile/automatic/mini_uzi(get_turf(H)) if("crossbow") diff --git a/code/game/machinery/gateway.dm b/code/game/machinery/gateway.dm new file mode 100644 index 0000000000..ec76dad3fd --- /dev/null +++ b/code/game/machinery/gateway.dm @@ -0,0 +1,49 @@ +/obj/structure/gatewayplaceholder + density = 1 + anchored = 1 + icon = 'gateway.dmi' + +/obj/structure/gatewayplaceholder/one + name = "Gateway" + desc = "A gateway" + icon_state = "off1" + +/obj/structure/gatewayplaceholder/two + name = "Gateway" + desc = "A gateway" + icon_state = "off2" + +/obj/structure/gatewayplaceholder/three + name = "Gateway" + desc = "A gateway" + icon_state = "off3" + +/obj/structure/gatewayplaceholder/four + name = "Gateway" + desc = "A gateway" + icon_state = "off4" + +/obj/structure/gatewayplaceholder/five + name = "Gateway" + desc = "A gateway" + icon_state = "off5" + +/obj/structure/gatewayplaceholder/six + name = "Gateway" + desc = "A gateway" + icon_state = "off6" + +/obj/structure/gatewayplaceholder/seven + name = "Gateway" + desc = "A gateway" + icon_state = "off7" + +/obj/structure/gatewayplaceholder/eight + name = "Gateway" + desc = "A gateway" + icon_state = "off8" + +/obj/structure/gatewayplaceholder/nine + name = "Gateway" + desc = "A gateway" + icon_state = "off9" \ No newline at end of file diff --git a/code/modules/mob/simple_animal/behemoth.dm b/code/modules/mob/simple_animal/behemoth.dm new file mode 100644 index 0000000000..5d3c6fcd9b --- /dev/null +++ b/code/modules/mob/simple_animal/behemoth.dm @@ -0,0 +1,126 @@ +/mob/living/simple_animal/constructbehemoth + name = "Behemoth" + real_name = "Behemoth" + original_name = "Behemoth" + desc = "The pinnacle of occult technology, Behemoths are the ultimate weapon in the Cult of Nar-Sie's arsenal." + icon = 'mob.dmi' + icon_state = "behemoth" + icon_living = "behemoth" + icon_dead = "shade_dead" + maxHealth = 750 + health = 750 + speak_emote = list("rumbles") + emote_hear = list("wails","screeches") + response_help = "thinks better of touching" + response_disarm = "flails at" + response_harm = "harmlessly punches the" + harm_intent_damage = 0 + melee_damage_lower = 50 + melee_damage_upper = 50 + attacktext = "brutally crushes" + minbodytemp = 0 + maxbodytemp = 4000 + min_oxy = 0 + max_co2 = 0 + max_tox = 0 + speed = 5 + wall_smash = 1 + nopush = 1 + a_intent = "harm" + stop_automated_movement = 1 + canstun = 0 + canweaken = 0 + var/energy = 0 + var/max_energy = 1000 + + + Life() + ..() + if(stat == 2) + new /obj/item/weapon/ectoplasm (src.loc) + for(var/mob/M in viewers(src, null)) + if((M.client && !( M.blinded ))) + M.show_message("\red [src] collapses in a shattered heap ") + ghostize(0) + del src + return + +/mob/living/simple_animal/constructbehemoth/attackby(var/obj/item/O as obj, var/mob/user as mob) + if(O.force) + if(O.force >= 11) + health -= O.force + for(var/mob/M in viewers(src, null)) + if ((M.client && !( M.blinded ))) + M.show_message("\red \b [src] has been attacked with the [O] by [user]. ") + else + for(var/mob/M in viewers(src, null)) + if ((M.client && !( M.blinded ))) + M.show_message("\red \b The [O] bounces harmlessly off of [src]. ") + else + usr << "\red This weapon is ineffective, it does no damage." + for(var/mob/M in viewers(src, null)) + if ((M.client && !( M.blinded ))) + M.show_message("\red [user] gently taps [src] with the [O]. ") + + +/mob/living/simple_animal/constructbehemoth/Bump(atom/movable/AM as mob|obj, yes) + + spawn( 0 ) + if ((!( yes ) || now_pushing)) + return + now_pushing = 1 + if(ismob(AM)) + var/mob/tmob = AM + if(tmob.nopush) + now_pushing = 0 + return + + tmob.LAssailant = src + now_pushing = 0 + ..() + if (!( istype(AM, /atom/movable) )) + return + if (!( now_pushing )) + now_pushing = 1 + if (!( AM.anchored )) + var/t = get_dir(src, AM) + if (istype(AM, /obj/structure/window)) + if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST) + for(var/obj/structure/window/win in get_step(AM,t)) + now_pushing = 0 + return + step(AM, t) + now_pushing = null + return + return + + +////////////////Powers////////////////// + + +/* +/client/proc/summon_cultist() + set category = "Behemoth" + set name = "Summon Cultist (300)" + set desc = "Teleport a cultist to your location" + if (istype(usr,/mob/living/simple_animal/constructbehemoth)) + + if(usr.energy<300) + usr << "\red You do not have enough power stored!" + return + + if(usr.stat) + return + + usr.energy -= 300 + var/list/mob/living/cultists = new + for(var/datum/mind/H in ticker.mode.cult) + if (istype(H.current,/mob/living)) + cultists+=H.current + var/mob/cultist = input("Choose the one who you want to summon", "Followers of Geometer") as null|anything in (cultists - usr) + if(!cultist) + return + if (cultist == usr) //just to be sure. + return + cultist.loc = usr.loc + usr.visible_message("/red [cultist] appears in a flash of red light as [usr] glows with power")*/ diff --git a/icons/obj/gate.dmi b/icons/obj/gate.dmi new file mode 100644 index 0000000000..e69de29bb2 diff --git a/icons/obj/machines/gateway.dmi b/icons/obj/machines/gateway.dmi new file mode 100644 index 0000000000000000000000000000000000000000..06bf9f8f71593353db7186041a57dd05ce6ed666 GIT binary patch literal 18301 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

-=>5}&yvekVZcPFOi4JQ3DGFWi}waYIxJ=JwJ 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 literal 0 HcmV?d00001 diff --git a/tgstation.dme b/tgstation.dme index 7444f6b345..7d13256f46 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -455,6 +455,7 @@ #include "code\game\machinery\door_control.dm" #include "code\game\machinery\flasher.dm" #include "code\game\machinery\Freezer.dm" +#include "code\game\machinery\gateway.dm" #include "code\game\machinery\hologram.dm" #include "code\game\machinery\hydroponics.dm" #include "code\game\machinery\igniter.dm" @@ -967,6 +968,7 @@ #include "code\modules\mob\organ\organ_external.dm" #include "code\modules\mob\organ\organ_internal.dm" #include "code\modules\mob\organ\pain.dm" +#include "code\modules\mob\simple_animal\behemoth.dm" #include "code\modules\mob\simple_animal\cat.dm" #include "code\modules\mob\simple_animal\constructs.dm" #include "code\modules\mob\simple_animal\corgi.dm"