cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Crazylemon spacing changes

Browse Source
This commit is contained in:
Kyep
2017-02-12 19:52:37 -08:00
parent 9f20cb1685
commit f8647a2108
13 changed files with 14 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm
+1 -7
View File
@@ -41,7 +41,6 @@
var/mob/living/simple_animal/hostile/poison/terror_spider/prince/user = owner
user.DoPrinceSmash()
// ---------- QUEEN ACTIONS
/datum/action/innate/terrorspider/queen/queennest
@@ -108,13 +107,11 @@
icon_state = "stickyweb1"
var/creator_ckey = null
/obj/effect/spider/terrorweb/New()
..()
if(prob(50))
icon_state = "stickyweb2"
/obj/effect/spider/terrorweb/CanPass(atom/movable/mover, turf/target)
if(istype(mover, /mob/living/simple_animal/hostile/poison/terror_spider))
return 1
@@ -136,8 +133,7 @@
return prob(20)
return ..()
/obj/effect/spider/terrorweb/bullet_act(var/obj/item/projectile/Proj)
/obj/effect/spider/terrorweb/bullet_act(obj/item/projectile/Proj)
if(Proj.damage_type != BRUTE && Proj.damage_type != BURN)
visible_message("<span class='danger'>[src] is undamaged by [Proj]!</span>")
// Webs don't care about disablers, tasers, etc. Or toxin damage. They're organic, but not alive.
@@ -146,7 +142,6 @@
// ---------- WRAP
/mob/living/simple_animal/hostile/poison/terror_spider/proc/FindWrapTarget()
if(!cocoon_target)
var/list/choices = list()
@@ -206,7 +201,6 @@
busy = 0
stop_automated_movement = 0
/mob/living/simple_animal/hostile/poison/terror_spider/prince/proc/DoPrinceSmash()
for(var/obj/machinery/atmospherics/unary/vent_pump/P in view(1,src))
if(P.welded)
code/modules/mob/living/simple_animal/hostile/terror_spiders/black.dm
+1
View File
@@ -24,6 +24,7 @@
stat_attack = 1 // ensures they will target people in crit, too!
spider_tier = TS_TIER_2
/mob/living/simple_animal/hostile/poison/terror_spider/black/spider_specialattack(mob/living/carbon/human/L, poisonable)
if(!poisonable)
return ..()
code/modules/mob/living/simple_animal/hostile/terror_spiders/chem.dm
+1 -6
View File
@@ -32,8 +32,6 @@
M.Paralyse(5)
..()
// Terror Spider, Queen Toxin
/datum/reagent/terror_queen_toxin
@@ -45,7 +43,4 @@
/datum/reagent/terror_queen_toxin/on_mob_life(mob/living/M)
// make them hallucinate a lot, like a changeling sting
if(M.hallucination < 400)
M.Hallucinate(50)
M.AdjustHallucinate(50, bound_upper = 400)
code/modules/mob/living/simple_animal/hostile/terror_spiders/ghost.dm
+1 -2
View File
@@ -39,5 +39,4 @@
return
key = user.key
for(var/mob/dead/observer/G in player_list)
G.show_message("<i>A ghost has taken control of <b>[src]</b>. ([ghost_follow_link(src, ghost=G)]).</i>")
G.show_message("<i>A ghost has taken control of <b>[src]</b>. ([ghost_follow_link(src, ghost=G)]).</i>")
code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm
+1
View File
@@ -21,6 +21,7 @@
move_to_delay = 5 // normal speed
stat_attack = 1 // ensures they will target people in crit, too!
/mob/living/simple_animal/hostile/poison/terror_spider/gray/spider_specialattack(mob/living/carbon/human/L, poisonable)
if(!poisonable)
..()
code/modules/mob/living/simple_animal/hostile/terror_spiders/hive.dm
+1 -4
View File
@@ -1,7 +1,6 @@
// All terror spider code that relates to queen ruling over a hive
/mob/living/simple_animal/hostile/poison/terror_spider/proc/DoHiveSense()
var/hsline = ""
to_chat(src, "Your Brood: ")
@@ -19,7 +18,6 @@
hsline += " AI "
to_chat(src,hsline)
/mob/living/simple_animal/hostile/poison/terror_spider/proc/CountSpiders()
var/numspiders = 0
for(var/mob/living/simple_animal/hostile/poison/terror_spider/T in ts_spiderlist)
@@ -39,5 +37,4 @@
for(var/obj/effect/spider/spiderling/terror_spiderling/L in ts_spiderling_list)
if(!L.stillborn && L.grow_as == specific_type && L.z == z)
numspiders += 1
return numspiders
return numspiders
code/modules/mob/living/simple_animal/hostile/terror_spiders/mother.dm
+1
View File
@@ -26,6 +26,7 @@
var/canspawn = 1
/mob/living/simple_animal/hostile/poison/terror_spider/mother/death(gibbed)
if(canspawn)
canspawn = 0
code/modules/mob/living/simple_animal/hostile/terror_spiders/purple.dm
+1 -3
View File
@@ -31,7 +31,6 @@
var/queen_visible = 1
var/cycles_noqueen = 0
/mob/living/simple_animal/hostile/poison/terror_spider/purple/spider_specialattack(mob/living/carbon/human/L, poisonable)
if(cycles_noqueen < 6 && prob(10))
visible_message("<span class='danger'>[src] rams into [L], knocking them to the floor!</span>")
@@ -40,7 +39,6 @@
else
..()
/mob/living/simple_animal/hostile/poison/terror_spider/purple/Life()
. = ..()
if(.) // if mob is NOT dead
@@ -84,4 +82,4 @@
degenerate = 1
to_chat(src,"<span class='userdanger'>Your link to your Queen has been broken! Your life force starts to drain away!</span>")
melee_damage_lower = 5
melee_damage_upper = 10
melee_damage_upper = 10
code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm
+2 -9
View File
@@ -50,6 +50,7 @@
var/datum/action/innate/terrorspider/queen/queeneggs/queeneggs_action
var/datum/action/innate/terrorspider/queen/queenfakelings/queenfakelings_action
/mob/living/simple_animal/hostile/poison/terror_spider/queen/New()
..()
queennest_action = new()
@@ -59,7 +60,6 @@
spider_growinstantly = 1
spider_spawnfrequency = 150
/mob/living/simple_animal/hostile/poison/terror_spider/queen/Life()
. = ..()
if(.) // if mob is NOT dead
@@ -174,8 +174,6 @@
else
to_chat(src, "<span class='danger'>Unrecognized egg type.</span>")
/mob/living/simple_animal/hostile/poison/terror_spider/queen/proc/DoQueenScreech(light_range, light_chance, camera_range, camera_chance)
visible_message("<span class='userdanger'>\The [src] emits a bone-chilling shriek!</span>")
for(var/obj/machinery/light/L in orange(light_range, src))
@@ -185,7 +183,6 @@
if(C.status && prob(camera_chance))
C.toggle_cam(src, 0)
/mob/living/simple_animal/hostile/poison/terror_spider/queen/proc/QueenFakeLings()
if(spider_can_fakelings)
spider_can_fakelings--
@@ -201,15 +198,12 @@
else
to_chat(src, "<span class='danger'>You have run out of uses of this ability.</span>")
/obj/item/projectile/terrorqueenspit
name = "poisonous spit"
damage = 0
icon_state = "toxin"
damage_type = TOX
/obj/item/projectile/terrorqueenspit/on_hit(mob/living/carbon/target)
if(ismob(target))
var/mob/living/L = target
@@ -217,5 +211,4 @@
if(L.can_inject(null, 0, "chest", 0))
L.reagents.add_reagent("terror_queen_toxin", 15)
if(!istype(L, /mob/living/simple_animal/hostile/poison/terror_spider))
L.adjustToxLoss(30)
L.adjustToxLoss(30)
code/modules/mob/living/simple_animal/hostile/terror_spiders/red.dm
+1 -1
View File
@@ -57,4 +57,4 @@
visible_message("<span class='notice'>[src] retracts its fangs a little.</span>")
melee_damage_lower = melee_damage_lower_rage0
melee_damage_upper = melee_damage_upper_rage0
..()
..()
code/modules/mob/living/simple_animal/hostile/terror_spiders/reproduction.dm
+1 -8
View File
@@ -15,12 +15,10 @@
var/spider_myqueen = null
var/use_vents = 1
/obj/effect/spider/spiderling/terror_spiderling/New()
..()
ts_spiderling_list += src
/obj/effect/spider/spiderling/terror_spiderling/Destroy()
ts_spiderling_list -= src
return ..()
@@ -33,7 +31,6 @@
else
..()
/obj/effect/spider/spiderling/terror_spiderling/process()
if(travelling_in_vent)
if(isturf(loc))
@@ -96,7 +93,6 @@
S.master_commander = master_commander
qdel(src)
// --------------------------------------------------------------------------------
// ----------------- TERROR SPIDERS: EGGS (USED BY NURSE AND QUEEN TYPES) ---------
// --------------------------------------------------------------------------------
@@ -116,7 +112,6 @@
spawn(10)
stop_automated_movement = 0
/obj/effect/spider/eggcluster/terror_eggcluster
name = "terror egg cluster"
desc = "A cluster of tiny spider eggs. They pulse with a strong inner life, and appear to have sharp thorns on the sides."
@@ -128,7 +123,6 @@
var/spiderling_number = 1
var/spiderling_ventcrawl = 1
/obj/effect/spider/eggcluster/terror_eggcluster/New()
..()
ts_egg_list += src
@@ -152,7 +146,6 @@
else if(spiderling_type == /mob/living/simple_animal/hostile/poison/terror_spider/queen)
name = "queen of terror eggs"
/obj/effect/spider/eggcluster/terror_eggcluster/Destroy()
ts_egg_list -= src
return ..()
@@ -176,4 +169,4 @@
var/obj/effect/spider/spiderling/terror_spiderling/S = new /obj/effect/spider/spiderling/terror_spiderling(get_turf(src))
S.stillborn = 1
// every set of eggs always spawn 5 spiderlings, but most are decoys
qdel(src)
qdel(src)
code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm
-12
View File
@@ -122,8 +122,6 @@ var/global/list/ts_spiderling_list = list()
// --------------------- TERROR SPIDERS: SHARED ATTACK CODE -----------------------
// --------------------------------------------------------------------------------
/mob/living/simple_animal/hostile/poison/terror_spider/AttackingTarget()
if(isterrorspider(target))
var/mob/living/simple_animal/hostile/poison/terror_spider/T = target
@@ -178,16 +176,10 @@ var/global/list/ts_spiderling_list = list()
/mob/living/simple_animal/hostile/poison/terror_spider/proc/spider_specialattack(mob/living/carbon/human/L, poisonable)
L.attack_animal(src)
// --------------------------------------------------------------------------------
// --------------------- TERROR SPIDERS: PROC OVERRIDES ---------------------------
// --------------------------------------------------------------------------------
/mob/living/simple_animal/hostile/poison/terror_spider/examine(mob/user)
..()
var/list/msgs = list()
@@ -212,7 +204,6 @@ var/global/list/ts_spiderling_list = list()
msgs += "<span class='warning'>It has blood dribbling from its mouth.</span>"
to_chat(usr,msgs.Join("<BR>"))
/mob/living/simple_animal/hostile/poison/terror_spider/New()
..()
ts_spiderlist += src
@@ -278,8 +269,6 @@ var/global/list/ts_spiderling_list = list()
if(prob(5))
CheckFaction()
/mob/living/simple_animal/hostile/poison/terror_spider/proc/handle_dying()
if(!hasdied)
hasdied = 1
@@ -296,7 +285,6 @@ var/global/list/ts_spiderling_list = list()
handle_dying()
..()
/mob/living/simple_animal/hostile/poison/terror_spider/proc/spider_special_action()
return
code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm
+2 -1
View File
@@ -24,6 +24,7 @@
spider_tier = TS_TIER_2
loot = list(/obj/item/clothing/accessory/medal)
/mob/living/simple_animal/hostile/poison/terror_spider/white/spider_specialattack(mob/living/carbon/human/L, poisonable)
if(!poisonable)
..()
@@ -38,4 +39,4 @@
/mob/living/simple_animal/hostile/poison/terror_spider/proc/IsInfected(mob/living/carbon/C) // Terror AI requires this
if(C.get_int_organ(/obj/item/organ/internal/body_egg))
return 1
return 0
return 0