Skip to content

Commit 4140275

Browse files
Axes TS gateway (ParadiseSS13#18825)
* Axes TS gateway * This too * Commit for MDB * This PR finna become my MDB2 test * aaaaaaaaa
1 parent f41e0f1 commit 4140275

File tree

13 files changed

+41
-31385
lines changed

13 files changed

+41
-31385
lines changed

_maps/map_files/RandomZLevels/terrorspiders.dmm

-31,059
This file was deleted.

code/modules/awaymissions/mission_code/UO71-terrorspiders.dm

-250
This file was deleted.

code/modules/mob/living/simple_animal/hostile/terror_spiders/ghost.dm

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
error_on_humanize = "You are not able to control any terror spider this round."
1919
else if(cannotPossess(user))
2020
error_on_humanize = "You have enabled antag HUD and are unable to re-enter the round."
21-
else if(spider_awaymission)
22-
error_on_humanize = "Terror spiders that are part of an away mission cannot be controlled by ghosts."
2321
else if(!ai_playercontrol_allowtype)
2422
error_on_humanize = "This specific type of terror spider is not player-controllable."
2523
else if(degenerate)

code/modules/mob/living/simple_animal/hostile/terror_spiders/hive.dm

+2-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
to_chat(src, "Your Brood: ")
77
for(var/thing in GLOB.ts_spiderlist)
88
var/mob/living/simple_animal/hostile/poison/terror_spider/T = thing
9-
if(T.spider_awaymission != spider_awaymission)
10-
continue
119
hsline = "* [T] in [get_area(T)], "
1210
if(T.stat == DEAD)
1311
hsline += "DEAD"
@@ -23,7 +21,7 @@
2321
var/numspiders = 0
2422
for(var/thing in GLOB.ts_spiderlist)
2523
var/mob/living/simple_animal/hostile/poison/terror_spider/T = thing
26-
if(T.stat != DEAD && !T.spider_placed && spider_awaymission == T.spider_awaymission)
24+
if(T.stat != DEAD && !T.spider_placed)
2725
numspiders += 1
2826
return numspiders
2927

@@ -34,7 +32,7 @@
3432
spider_totals[thistype] = 0
3533
for(var/thing in GLOB.ts_spiderlist)
3634
var/mob/living/simple_animal/hostile/poison/terror_spider/T = thing
37-
if(T.stat == DEAD || T.spider_placed || spider_awaymission != T.spider_awaymission)
35+
if(T.stat == DEAD || T.spider_placed)
3836
continue
3937
if(check_mine && T.spider_myqueen != src)
4038
continue

code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm

-5
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@
3232
ai_spins_webs = FALSE
3333
gender = MALE
3434

35-
/mob/living/simple_animal/hostile/poison/terror_spider/prince/death(gibbed)
36-
if(can_die() && !hasdied && spider_uo71)
37-
UnlockBlastDoors("UO71_SciStorage")
38-
return ..()
39-
4035
/mob/living/simple_animal/hostile/poison/terror_spider/prince/spider_specialattack(mob/living/carbon/human/L)
4136
L.KnockDown(10 SECONDS)
4237
return ..()

code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm

+1-8
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,7 @@
5959
var/datum/action/innate/terrorspider/remoteview/remoteview_action = new
6060
remoteview_action.Grant(src)
6161
grant_queen_subtype_abilities()
62-
spider_myqueen = src
63-
if(spider_awaymission)
64-
spider_growinstantly = TRUE
65-
spider_spawnfrequency = 150
62+
spider_myqueen = src // ???
6663

6764

6865
/mob/living/simple_animal/hostile/poison/terror_spider/queen/proc/grant_queen_subtype_abilities()
@@ -96,8 +93,6 @@
9693

9794
/mob/living/simple_animal/hostile/poison/terror_spider/queen/death(gibbed)
9895
if(can_die() && !hasdied)
99-
if(spider_uo71)
100-
UnlockBlastDoors("UO71_Caves")
10196
// When a queen (or subtype!) dies, so do all of her spiderlings, and half of all her fully grown offspring
10297
// This feature is intended to provide a way for crew to still win even if the queen has overwhelming numbers - by sniping the queen.
10398
for(var/thing in GLOB.ts_spiderlist)
@@ -194,8 +189,6 @@
194189
if(world.time > (spider_lastspawn + spider_spawnfrequency))
195190
if(prob(20))
196191
if(ai_nest_is_full())
197-
if(spider_awaymission)
198-
spider_spawnfrequency = spider_spawnfrequency_stable
199192
neststep = 4
200193
else
201194
spider_lastspawn = world.time

code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ai.dm

-9
Original file line numberDiff line numberDiff line change
@@ -345,12 +345,3 @@
345345
if(!target)
346346
return
347347
. = ..()
348-
349-
// --------------------------------------------------------------------------------
350-
// --------------------- TERROR SPIDERS: MISC AI CODE -----------------------------
351-
// --------------------------------------------------------------------------------
352-
353-
/mob/living/simple_animal/hostile/poison/terror_spider/proc/UnlockBlastDoors(target_id_tag)
354-
for(var/obj/machinery/door/poddoor/P in GLOB.airlocks)
355-
if(P.density && P.id_tag == target_id_tag && P.z == z && !P.operating)
356-
P.open()

0 commit comments

Comments
 (0)