Skip to content

Beepsky Non-Human Target Bugfix #36975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 29, 2024
Merged

Beepsky Non-Human Target Bugfix #36975

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1b276a
beepsky is now properly racist again
SonixApache Aug 22, 2024
2eb10dd
I dont care if it's unatomic, scootaloos must go
SonixApache Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/game/machinery/bots/secbot.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ Auto Patrol: []"},
if(istype(perp.wear_suit, /obj/item/clothing/suit/wizrobe))
threatcount += PERP_LEVEL_ARREST/2

if(perp.dna && perp.dna.mutantrace && perp.dna.mutantrace != "none")
if(!isjusthuman(perp))
threatcount += PERP_LEVEL_ARREST/2
var/visible_id = perp.get_visible_id()
if(!visible_id)
Expand Down Expand Up @@ -381,7 +381,7 @@ Auto Patrol: []"},

/obj/machinery/bot/secbot/proc/speak(var/message)
visible_message("<span class='game say'><span class='name'>[src]</span> beeps, \"[message]\"",\
drugged_message="<span class='game say'><span class='name'>[src]</span> beeps, \"[pick("Wait! Let's be friends!","Wait for me!","You're so cool!","Who's your favourite pony?","I-It's not like I like you or anything...","Wanna see a magic trick?","Let's go have fun, assistant-kun~")]\"")
drugged_message="<span class='game say'><span class='name'>[src]</span> beeps, \"[pick("Wait! Let's be friends!","Wait for me!","You're so cool!","I-It's not like I like you or anything...","Wanna see a magic trick?","Let's go have fun, assistant-kun~")]\"")
return

/obj/machinery/bot/secbot/explode()
Expand Down