Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions code/game/objects/items/robot/items/storage.dm
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,11 @@
organ.forceMove(get_turf(src))
return CLICK_ACTION_SUCCESS

/obj/item/borg/apparatus/organ_storage/monster
name = "core storage bag"
desc = "A container for holding and application of various monster organs."
storable = list(/obj/item/organ/internal/monster_core)

///Apparatus to allow Engineering/Sabo borgs to manipulate any material sheets.
/obj/item/borg/apparatus/sheet_manipulator
name = "material manipulation apparatus"
Expand Down
5 changes: 5 additions & 0 deletions code/game/objects/structures/lavaland/necropolis_tendril.dm
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ GLOBAL_LIST_INIT(tendrils, list())
collector.start_pulling(loot)
collected += WEAKREF(collector)

/obj/effect/collapse/attack_robot(mob/living/user)
. = ..()
if (Adjacent(user))
return attack_hand(user)

/obj/effect/collapse/Destroy()
collected.Cut()
QDEL_NULL(emitted_light)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,11 @@
toggle_the_gate(user)
return ..()

/obj/structure/necropolis_gate/attack_robot(mob/living/user)
. = ..()
if (Adjacent(user))
return attack_hand(user)

/obj/structure/necropolis_gate/proc/toggle_the_gate(mob/user, legion_damaged)
if(changing_openness)
return
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/silicon/robot/robot_model.dm
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,7 @@
/obj/item/gun/energy/recharge/kinetic_accelerator/cyborg,
/obj/item/gps/cyborg,
/obj/item/stack/marker_beacon,
/obj/item/borg/apparatus/organ_storage/monster,
)
radio_channels = list(RADIO_CHANNEL_SCIENCE, RADIO_CHANNEL_SUPPLY)
emag_modules = list(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,14 @@ While using this makes the system rely on OnFire, it still gives options for tim
fire = 100
acid = 100

/obj/structure/elite_tumor/attack_robot(mob/living/user)
. = ..()
if (Adjacent(user))
return attack_hand(user)

/obj/structure/elite_tumor/attack_hand(mob/user, list/modifiers)
. = ..()
if(!ishuman(user))
if(!ishuman(user) && !iscyborg(user))
return
switch(activity)
if(TUMOR_PASSIVE)
Expand Down
5 changes: 5 additions & 0 deletions code/modules/projectiles/guns/energy/kinetic_accelerator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,11 @@
holds_charge = TRUE
unique_frequency = TRUE
max_mod_capacity = 80
can_bayonet = FALSE
sharpness = SHARP_EDGED
force = 15
wound_bonus = 5
bare_wound_bonus = 10 // worse than surviavl knife

/obj/item/gun/energy/recharge/kinetic_accelerator/minebot
trigger_guard = TRIGGER_GUARD_ALLOW_ALL
Expand Down
Binary file modified icons/obj/kitchen.dmi
Binary file not shown.
Binary file modified icons/obj/weapons/guns/bayonets.dmi
Binary file not shown.
Binary file modified icons/obj/weapons/guns/energy.dmi
Binary file not shown.
12 changes: 12 additions & 0 deletions monkestation/code/modules/factory_type_beat/ore_vent.dm
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,18 @@
scan_and_confirm(user)
return TRUE

/obj/structure/ore_vent/attack_robot(mob/living/user)
. = ..()
if(.)
return TRUE
if(!Adjacent(user))
return TRUE
if(tapped)
balloon_alert_to_viewers("vent tapped!")
return TRUE
scan_and_confirm(user)
return TRUE

/obj/structure/ore_vent/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
Expand Down
Loading