cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 14:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the map/code issues that the body bags caused.

Browse Source 
/obj/effects is now /obj/effect.
/obj/station_objects is now /obj/structure.
Did a bit of minor blob work. 
The Bay 12 body bags were replaced with closets because having two sets of code that do almost the same thing is silly.
Changed back a few of the last jobproc edits as the remove from list before assign was a check to see if the mob was fucked up and if it was remove it so we did not check it again as it would still be fucked up.
The medbay/tox monkeys names are random once more.  More random name monkeys will help with changeling and clean up the observe/mob menus.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2324 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-10-03 10:28:57 +00:00
parent e8c6b08419
commit 17ed3899c4
314 changed files with 9099 additions and 9118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/critters/critter.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/obj/effects/critter
/obj/effect/critter
name = "Critter"
desc = "Generic critter."
icon = 'critter.dmi'
code/modules/critters/critter_AI.dm
+7 -7
View File
@@ -1,5 +1,5 @@
/obj/effects/critter
/obj/effect/critter
New()
spawn(0) process()//I really dont like this much but it seems to work well
@@ -123,11 +123,11 @@
break
if(!src.attack)
for(var/obj/effects/critter/C in view(src.seekrange,src))
if(istype(C, /obj/effects/critter) && !src.atkcritter) continue
for(var/obj/effect/critter/C in view(src.seekrange,src))
if(istype(C, /obj/effect/critter) && !src.atkcritter) continue
if(istype(C, /obj/mecha) && !src.atkmech) continue
if(C.health <= 0) continue
if(istype(C, /obj/effects/critter) && src.atkcritter)
if(istype(C, /obj/effect/critter) && src.atkcritter)
if((istype(C, src.type) && !src.atksame) || (C == src)) continue
src.attack = 1
if(istype(C, /obj/mecha) && src.atkmech) src.attack = 1
@@ -193,7 +193,7 @@
/*TODO: Figure out how to handle special things like this dont really want to give it to every critter
/obj/effects/critter/proc/CritterTeleport(var/telerange, var/dospark, var/dosmoke)
/obj/effect/critter/proc/CritterTeleport(var/telerange, var/dospark, var/dosmoke)
if (!src.alive) return
var/list/randomturfs = new/list()
for(var/turf/T in orange(src, telerange))
@@ -201,11 +201,11 @@
randomturfs.Add(T)
src.loc = pick(randomturfs)
if (dospark)
var/datum/effects/system/spark_spread/s = new /datum/effects/system/spark_spread
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
s.set_up(5, 1, src)
s.start()
if (dosmoke)
var/datum/effects/system/harmless_smoke_spread/smoke = new /datum/effects/system/harmless_smoke_spread()
var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread()
smoke.set_up(10, 0, src.loc)
smoke.start()
src.task = "thinking"
code/modules/critters/critter_defenses.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/*
Contains the procs that control attacking critters
*/
/obj/effects/critter
/obj/effect/critter
attackby(obj/item/weapon/W as obj, mob/living/user as mob)
..()
code/modules/critters/critters.dm
+9 -9
View File
@@ -1,4 +1,4 @@
/obj/effects/critter/creature
/obj/effect/critter/creature
name = "creature"
desc = "A sanity-destroying otherthing."
icon = 'otherthing.dmi'
@@ -22,7 +22,7 @@
attacktext = "chomps"
/obj/effects/critter/roach
/obj/effect/critter/roach
name = "cockroach"
desc = "An unpleasant insect that lives in filthy places."
icon_state = "roach"
@@ -40,7 +40,7 @@
del(src)
/obj/effects/critter/killertomato
/obj/effect/critter/killertomato
name = "killer tomato"
desc = "Oh shit, you're really fucked now."
icon_state = "killertomato"
@@ -74,7 +74,7 @@
/obj/effects/critter/spore
/obj/effect/critter/spore
name = "plasma spore"
desc = "A barely intelligent colony of organisms. Very volatile."
icon_state = "spore"
@@ -104,7 +104,7 @@
src.Die()
/obj/effects/critter/blob
/obj/effect/critter/blob
name = "blob"
desc = "Some blob thing."
icon_state = "blob"
@@ -129,7 +129,7 @@
/obj/effects/critter/spesscarp
/obj/effect/critter/spesscarp
name = "Spess Carp"
desc = "A ferocious, fang-bearing creature that resembles a fish."
icon_state = "spesscarp"
@@ -181,7 +181,7 @@
/obj/effects/critter/spesscarp/elite
/obj/effect/critter/spesscarp/elite
desc = "Oh shit, you're really fucked now. It has an evil gleam in its eye."
health = 50
max_health = 50
@@ -193,7 +193,7 @@
/obj/effects/critter/walkingmushroom
/obj/effect/critter/walkingmushroom
name = "Walking Mushroom"
desc = "A...huge...mushroom...with legs!?"
icon_state = "walkingmushroom"
@@ -227,7 +227,7 @@
/obj/effects/critter/lizard
/obj/effect/critter/lizard
name = "Lizard"
desc = "A cute tiny lizard."
icon_state = "lizard"
code/modules/critters/hivebots/hivebot.dm
+19 -19
View File
@@ -2,7 +2,7 @@
damage = 5
mobdamage = list(BRUTE = 5, BURN = 0, TOX = 0, OXY = 0, CLONE = 0)
/obj/effects/critter/hivebot
/obj/effect/critter/hivebot
name = "Hivebot"
desc = "A small robot"
icon = 'hivebot.dmi'
@@ -39,8 +39,8 @@
walk_to(src,0)
src.visible_message("<b>[src]</b> blows apart!")
var/turf/Ts = get_turf(src)
new /obj/effects/decal/cleanable/robot_debris(Ts)
var/datum/effects/system/spark_spread/s = new /datum/effects/system/spark_spread
new /obj/effect/decal/cleanable/robot_debris(Ts)
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
del(src)
@@ -71,11 +71,11 @@
break
if(!src.attack)
for(var/obj/effects/critter/C in view(src.seekrange,src))
if(istype(C, /obj/effects/critter) && !src.atkcritter) continue
for(var/obj/effect/critter/C in view(src.seekrange,src))
if(istype(C, /obj/effect/critter) && !src.atkcritter) continue
if(C.health <= 0) continue
if(istype(C, /obj/effects/critter) && src.atkcritter)
if((istype(C, /obj/effects/critter/hivebot) && !src.atksame) || (C == src)) continue
if(istype(C, /obj/effect/critter) && src.atkcritter)
if((istype(C, /obj/effect/critter/hivebot) && !src.atksame) || (C == src)) continue
T = C
break
@@ -142,23 +142,23 @@
/obj/effects/critter/hivebot/range
/obj/effect/critter/hivebot/range
name = "Hivebot"
desc = "A smallish robot, this one is armed!"
ranged = 1
/obj/effects/critter/hivebot/rapid
/obj/effect/critter/hivebot/rapid
ranged = 1
rapid = 1
/obj/effects/critter/hivebot/strong
/obj/effect/critter/hivebot/strong
name = "Strong Hivebot"
desc = "A robot, this one is armed and looks tough!"
health = 50
armor = 10
ranged = 1
/obj/effects/critter/hivebot/borg
/obj/effect/critter/hivebot/borg
health = 20
atksilicon = 1
ranged = 1
@@ -166,7 +166,7 @@
/obj/effects/critter/hivebot/tele//this still needs work
/obj/effect/critter/hivebot/tele//this still needs work
name = "Beacon"
desc = "Some odd beacon thing"
icon = 'Hivebot.dmi'
@@ -198,7 +198,7 @@
New()
..()
var/datum/effects/system/harmless_smoke_spread/smoke = new /datum/effects/system/harmless_smoke_spread()
var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread()
smoke.set_up(5, 0, src.loc)
smoke.start()
for(var/mob/O in viewers(src, null))
@@ -218,11 +218,11 @@
bot_amt--
switch(bot_type)
if("norm")
new /obj/effects/critter/hivebot(get_turf(src))
new /obj/effect/critter/hivebot(get_turf(src))
if("range")
new /obj/effects/critter/hivebot/range(get_turf(src))
new /obj/effect/critter/hivebot/range(get_turf(src))
if("rapid")
new /obj/effects/critter/hivebot/rapid(get_turf(src))
new /obj/effect/critter/hivebot/rapid(get_turf(src))
spawn(100)
del(src)
return
@@ -237,14 +237,14 @@
turn_on = 2
..()
/obj/effects/critter/hivebot/tele/massive
/obj/effect/critter/hivebot/tele/massive
bot_type = "norm"
bot_amt = 30
auto_spawn = 0
/obj/effects/critter/hivebot/tele/ranged
/obj/effect/critter/hivebot/tele/ranged
bot_type = "range"
/obj/effects/critter/hivebot/tele/rapid
/obj/effect/critter/hivebot/tele/rapid
bot_type = "rapid"
spawn_delay = 800