cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes Swarmer Teleport and Swarmer Typo (#348)

Browse Source 
* Merge pull request #52945 from IndieanaJones/swarmerbugfix

Fixes Swarmer Teleport and Swarmer Typo

* Fixes Swarmer Teleport and Swarmer Typo

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-08-15 20:26:08 +02:00
committed by GitHub
co-authored by ShizCalev
parent cbb39eca66
commit e5bc194942
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/swarmers/swarmer.dm
+6 -4
View File
@@ -130,15 +130,17 @@
drone.LoseTarget()
drone.Goto(clicked_turf, drone.move_to_delay)
/mob/living/simple_animal/hostile/swarmer/CtrlClickOn(atom/A)
face_atom(A)
/mob/living/simple_animal/hostile/swarmer/CtrlClickOn(atom/target)
face_atom(target)
if(!istype(target, /mob/living))
return
if(!isturf(loc))
return
if(next_move > world.time)
return
if(!A.Adjacent(src))
if(!target.Adjacent(src))
return
prepare_target(src)
prepare_target(target)
////END CTRL CLICK FOR SWARMERS////
code/modules/swarmers/swarmer_objs.dm
+2 -2
View File
@@ -75,7 +75,7 @@
var/mob/living/simple_animal/hostile/swarmer/newswarmer = new /mob/living/simple_animal/hostile/swarmer(src)
newswarmer.key = user.key
addtimer(CALLBACK(src, .proc/release_swarmer, newswarmer), 30 SECONDS)
to_chat(newswarmer, "<span class='boldannounce'>SWARMER CONSTURCTION INITIALIZED. TIME TO COMPLETION: 30 SECONDS</span>")
to_chat(newswarmer, "<span class='boldannounce'>SWARMER CONSTRUCTION INITIALIZED. TIME TO COMPLETION: 30 SECONDS</span>")
processing_swarmer = TRUE
return TRUE
@@ -87,7 +87,7 @@
* * swarmer - The swarmer being released and told what to do
*/
/obj/structure/swarmer_beacon/proc/release_swarmer(mob/swarmer)
to_chat(swarmer, "<span class='bold'>SWARMER CONSTURCTION COMPLETED. OBJECTIVES:\n\
to_chat(swarmer, "<span class='bold'>SWARMER CONSTRUCTION COMPLETED. OBJECTIVES:\n\
1. CONSUME RESOURCES AND REPLICATE UNTIL THERE ARE NO MORE RESOURCES LEFT\n\
2. ENSURE PROTECTION OF THE BEACON SO THIS LOCATION CAN BE INVADED AT A LATER DATE; DO NOT PERFORM ACTIONS THAT WOULD RENDER THIS LOCATION DANGEROUS OR INHOSPITABLE\n\
3. BIOLOGICAL RESOURCES WILL BE HARVESTED AT A LATER DATE: DO NOT HARM THEM\n\