cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 21:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Various removals. (#14135)

Browse Source
This commit is contained in:
TheDanseMacabre
2022-07-17 22:12:11 +02:00
committed by GitHub
parent fce1a34c24
commit ed43343dcc
41 changed files with 119 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/bot/ed209bot.dm
+7 -7
View File
@@ -9,7 +9,7 @@
#define SECBOT_FOLLOW 8 // follows a target
/mob/living/bot/secbot/ed209
name = "ED-209 Security Robot"
name = "Security Assault Robot"
desc = "A security robot. He looks less than thrilled."
icon = 'icons/obj/aibots.dmi'
icon_state = "ed2090"
@@ -285,12 +285,12 @@
// Assembly
/obj/item/secbot_assembly/ed209_assembly
name = "ED-209 assembly"
name = "security assault robot assembly"
desc = "Some sort of bizarre assembly."
icon = 'icons/obj/aibots.dmi'
icon_state = "ed209_frame"
item_state = "ed209_frame"
created_name = "ED-209 Security Robot"
created_name = "Security Assault Robot"
var/lasercolor = ""
/obj/item/secbot_assembly/ed209_assembly/attackby(var/obj/item/W as obj, var/mob/user as mob)
@@ -372,13 +372,13 @@
if(W.use_tool(src, user, 40, volume = 50) && build_step == 6)
if(C.use(1))
build_step++
to_chat(user, "<span class='notice'>You wire the ED-209 assembly.</span>")
name = "wired ED-209 assembly"
to_chat(user, "<span class='notice'>You wire the security assault robot assembly.</span>")
name = "wired security assault robot assembly"
return
if(7)
if(istype(W, /obj/item/gun/energy/disruptorpistol))
name = "taser ED-209 assembly"
name = "taser security assault robot assembly"
build_step++
to_chat(user, "<span class='notice'>You add [W] to [src].</span>")
item_state = "ed209_taser"
@@ -400,7 +400,7 @@
if(9)
if(istype(W, /obj/item/cell))
build_step++
to_chat(user, "<span class='notice'>You complete the ED-209.</span>")
to_chat(user, "<span class='notice'>You complete the security assault robot.</span>")
var/turf/T = get_turf(src)
new /mob/living/bot/secbot/ed209(T,created_name,lasercolor)
user.drop_from_inventory(W,get_turf(src))
code/modules/mob/living/carbon/human/unarmed_attack.dm
+1 -1
View File
@@ -90,7 +90,7 @@ var/global/list/sparring_attack_cache = list()
target.apply_effect(attack_damage * 0.4, WEAKEN, armor)
if(BP_GROIN)
if(pain_message)
target.visible_message("<span class='warning'>[target] looks like [target.get_pronoun("he")] [target.get_pronoun("is")] in pain!</span>", "<span class='warning'>[(target.gender=="female") ? "Oh god that hurt!" : "Oh no, not your [pick("testicles", "crown jewels", "clockweights", "family jewels", "marbles", "bean bags", "teabags", "sweetmeats", "goolies")]!"]</span>")
target.visible_message("<span class='warning'>[target] looks like [target.get_pronoun("he")] [target.get_pronoun("is")] in pain!</span>", "<span class='warning'>[(target.gender=="female") ? "Oh god that hurt!" : "Oh no, that REALLY hurt!"]</span>")
target.apply_effects(stutter = attack_damage * 2, agony = attack_damage* 3, blocked = armor)
if(BP_L_LEG, BP_L_FOOT, BP_R_LEG, BP_R_FOOT)
if(!target.lying)