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

TG: Fixed Erro's NON COMPILING CODE regarding flashlights

Browse Source 
Made it so simple_animals with destroyer can smash tables

Reverted the detectives ammo to nonlethal

Deathsquad now spawns with loyalty implants by Deuryn's request (for IMMERSION)

Fixed a bit of border being left on the red boxing glove sprites
Revision: r3159
Author: 	 kortgstation
This commit is contained in:
Ren Erthilo
2012-04-24 01:15:49 +01:00
parent 16cea4767b
commit 31b44f76d9
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/game/objects/tables_racks.dm
View File

@@ -78,6 +78,25 @@ TABLE AND RACK OBJECT INTERATIONS
return
/obj/structure/table/attack_animal(mob/living/simple_animal/user as mob) //Removed code for larva since it doesn't work. Previous code is now a larva ability. /N
if(user.wall_smash)
usr << text("\red You destroy the table.")
for(var/mob/O in oviewers())
if ((O.client && !( O.blinded )))
O << text("\red [] smashes the table apart!", user)
if(istype(src, /obj/structure/table/reinforced))
new /obj/item/weapon/table_parts/reinforced( src.loc )
else if(istype(src, /obj/structure/table/woodentable))
new/obj/item/weapon/table_parts/wood( src.loc )
else
new /obj/item/weapon/table_parts( src.loc )
src.density = 0
del(src)
return
/obj/structure/table/attack_hand(mob/user as mob)
if (usr.mutations & HULK)
usr << text("\blue You destroy the table.")

9
code/modules/admin/verbs/striketeam.dm
View File

@@ -107,6 +107,7 @@ var/global/sent_strike_team = 0
message_admins("\blue [key_name_admin(usr)] has spawned a CentCom strike squad.", 1)
log_admin("[key_name(usr)] used Spawn Death Squad.")
//feedback_add_details("admin_verb","DTHS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/create_death_commando(obj/spawn_location, leader_selected = 0)
var/mob/living/carbon/human/new_commando = new(spawn_location.loc)
@@ -177,6 +178,14 @@ var/global/sent_strike_team = 0
equip_if_possible(new /obj/item/weapon/gun/energy/pulse_rifle(src), slot_r_hand)
var/datum/organ/external/O = src.organs[pick(src.organs)]
var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(O)
O.implant += L
L.imp_in = src
L.implanted = 1
var/obj/item/weapon/card/id/W = new(src)
W.name = "[real_name]'s ID Card"
W.icon_state = "centcom"