Skip to content

Commit

Permalink
Cogscarab Dynamic Fix + suppressor warning fix (#10145)
Browse files Browse the repository at this point in the history
* Fix dynamic cogscarab fix

* Fix suppressor warning
  • Loading branch information
itsmeow authored Nov 6, 2023
1 parent abd36ea commit 4443ddd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@
if(!ismob(servant_mind?.current)) // user disconnected and was not assigned a mob.
log_game("DYNAMIC: Clockcult mind \"[servant_mind?.key]\" was lost during execute() - adding a cogscarab.")
assigned -= servant_mind
var/obj/effect/mob_spawn/drone/cogscarab = new(pick_n_take(spawns))
new /obj/effect/mob_spawn/drone/cogscarab(pick_n_take(spawns))
continue
servant_mind.current.forceMove(pick_n_take(spawns))
servant_mind.current.set_species(/datum/species/human)
Expand Down
1 change: 0 additions & 1 deletion code/modules/projectiles/guns/ballistic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,6 @@
return
if(loc == user)
if(suppressed && can_unsuppress)
var/obj/item/suppressor/S = suppressed
if(!user.is_holding(src))
return
to_chat(user, "<span class='notice'>You unscrew \the [suppressed] from \the [src].</span>")
Expand Down

0 comments on commit 4443ddd

Please sign in to comment.