cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes All Weapons

Browse Source
This commit is contained in:
Fox McCloud
2018-04-15 16:25:56 -04:00
parent 8b576c4d42
commit 5c4aa9b3fd
1100 changed files with 17642 additions and 17666 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/augments_arms.dm
+13 -13
View File
@@ -33,7 +33,7 @@
..()
to_chat(user, "<span class='info'>[src] is assembled in the [parent_organ == "r_arm" ? "right" : "left"] arm configuration. You can use a screwdriver to reassemble it.</span>")
/obj/item/organ/internal/cyberimp/arm/attackby(obj/item/weapon/W, mob/user, params)
/obj/item/organ/internal/cyberimp/arm/attackby(obj/item/W, mob/user, params)
..()
if(isscrewdriver(W))
if(parent_organ == "r_arm")
@@ -43,7 +43,7 @@
slot = parent_organ + "_device"
to_chat(user, "<span class='notice'>You modify [src] to be installed on the [parent_organ == "r_arm" ? "right" : "left"] arm.</span>")
update_icon()
else if(istype(W, /obj/item/weapon/card/emag))
else if(istype(W, /obj/item/card/emag))
emag_act()
/obj/item/organ/internal/cyberimp/arm/remove(mob/living/carbon/M, special = 0)
@@ -126,7 +126,7 @@
// You can emag the arm-mounted implant by activating it while holding emag in it's hand.
var/arm_slot = (parent_organ == "r_arm" ? slot_r_hand : slot_l_hand)
if(istype(owner.get_item_by_slot(arm_slot), /obj/item/weapon/card/emag) && emag_act())
if(istype(owner.get_item_by_slot(arm_slot), /obj/item/card/emag) && emag_act())
return
if(!holder || (holder in src))
@@ -163,7 +163,7 @@
desc = "A variant of the arm cannon implant that fires lethal laser beams. The cannon emerges from the subject's arm and remains inside when not in use."
icon_state = "arm_laser"
origin_tech = "materials=4;combat=4;biotech=4;powerstorage=4;syndicate=3"
contents = newlist(/obj/item/weapon/gun/energy/laser/mounted)
contents = newlist(/obj/item/gun/energy/laser/mounted)
/obj/item/organ/internal/cyberimp/arm/gun/laser/l
parent_organ = "l_arm"
@@ -174,7 +174,7 @@
desc = "A variant of the arm cannon implant that fires electrodes and disabler shots. The cannon emerges from the subject's arm and remains inside when not in use."
icon_state = "arm_taser"
origin_tech = "materials=5;combat=5;biotech=4;powerstorage=4"
contents = newlist(/obj/item/weapon/gun/energy/gun/advtaser/mounted)
contents = newlist(/obj/item/gun/energy/gun/advtaser/mounted)
/obj/item/organ/internal/cyberimp/arm/gun/taser/l
parent_organ = "l_arm"
@@ -184,29 +184,29 @@
name = "integrated toolset implant"
desc = "A stripped-down version of engineering cyborg toolset, designed to be installed on subject's arm. Contains all neccessary tools."
origin_tech = "materials=3;engineering=4;biotech=3;powerstorage=4"
contents = newlist(/obj/item/weapon/screwdriver/cyborg, /obj/item/weapon/wrench/cyborg, /obj/item/weapon/weldingtool/largetank/cyborg,
/obj/item/weapon/crowbar/cyborg, /obj/item/weapon/wirecutters/cyborg, /obj/item/device/multitool/cyborg)
contents = newlist(/obj/item/screwdriver/cyborg, /obj/item/wrench/cyborg, /obj/item/weldingtool/largetank/cyborg,
/obj/item/crowbar/cyborg, /obj/item/wirecutters/cyborg, /obj/item/device/multitool/cyborg)
/obj/item/organ/internal/cyberimp/arm/toolset/l
parent_organ = "l_arm"
/obj/item/organ/internal/cyberimp/arm/toolset/emag_act()
if(!(locate(/obj/item/weapon/kitchen/knife/combat/cyborg) in items_list))
if(!(locate(/obj/item/kitchen/knife/combat/cyborg) in items_list))
to_chat(usr, "<span class='notice'>You unlock [src]'s integrated knife!</span>")
items_list += new /obj/item/weapon/kitchen/knife/combat/cyborg(src)
items_list += new /obj/item/kitchen/knife/combat/cyborg(src)
return 1
return 0
/obj/item/organ/internal/cyberimp/arm/esword
name = "arm-mounted energy blade"
desc = "An illegal, and highly dangerous cybernetic implant that can project a deadly blade of concentrated enregy."
contents = newlist(/obj/item/weapon/melee/energy/blade/hardlight)
contents = newlist(/obj/item/melee/energy/blade/hardlight)
origin_tech = "materials=4;combat=5;biotech=3;powerstorage=2;syndicate=5"
/obj/item/organ/internal/cyberimp/arm/medibeam
name = "integrated medical beamgun"
desc = "A cybernetic implant that allows the user to project a healing beam from their hand."
contents = newlist(/obj/item/weapon/gun/medbeam)
contents = newlist(/obj/item/gun/medbeam)
origin_tech = "materials=5;combat=2;biotech=5;powerstorage=4;syndicate=1"
/obj/item/organ/internal/cyberimp/arm/flash
@@ -230,7 +230,7 @@
/obj/item/organ/internal/cyberimp/arm/combat
name = "combat cybernetics implant"
desc = "A powerful cybernetic implant that contains combat modules built into the user's arm"
contents = newlist(/obj/item/weapon/melee/energy/blade/hardlight, /obj/item/weapon/gun/medbeam, /obj/item/borg/stun, /obj/item/device/flash/armimplant)
contents = newlist(/obj/item/melee/energy/blade/hardlight, /obj/item/gun/medbeam, /obj/item/borg/stun, /obj/item/device/flash/armimplant)
origin_tech = "materials=5;combat=7;biotech=5;powerstorage=5;syndicate=6;programming=5"
/obj/item/organ/internal/cyberimp/arm/combat/New()
@@ -242,7 +242,7 @@
/obj/item/organ/internal/cyberimp/arm/surgery
name = "surgical toolset implant"
desc = "A set of surgical tools hidden behind a concealed panel on the user's arm"
contents = newlist(/obj/item/weapon/retractor, /obj/item/weapon/hemostat, /obj/item/weapon/cautery, /obj/item/weapon/surgicaldrill, /obj/item/weapon/scalpel, /obj/item/weapon/circular_saw, /obj/item/weapon/bonegel, /obj/item/weapon/FixOVein, /obj/item/weapon/bonesetter)
contents = newlist(/obj/item/retractor, /obj/item/hemostat, /obj/item/cautery, /obj/item/surgicaldrill, /obj/item/scalpel, /obj/item/circular_saw, /obj/item/bonegel, /obj/item/FixOVein, /obj/item/bonesetter)
origin_tech = "materials=3;engineering=3;biotech=3;programming=2;magnets=3"
// lets make IPCs even *more* vulnerable to EMPs!
code/modules/surgery/organs/augments_internal.dm
+4 -4
View File
@@ -277,24 +277,24 @@
//BOX O' IMPLANTS
/obj/item/weapon/storage/box/cyber_implants
/obj/item/storage/box/cyber_implants
name = "boxed cybernetic implant"
desc = "A sleek, sturdy box."
icon_state = "cyber_implants"
/obj/item/weapon/storage/box/cyber_implants/New(loc, implant)
/obj/item/storage/box/cyber_implants/New(loc, implant)
..()
new /obj/item/device/autoimplanter(src)
if(ispath(implant))
new implant(src)
/obj/item/weapon/storage/box/cyber_implants/bundle
/obj/item/storage/box/cyber_implants/bundle
name = "boxed cybernetic implants"
var/list/boxed = list(/obj/item/organ/internal/cyberimp/eyes/xray,/obj/item/organ/internal/cyberimp/eyes/thermals,
/obj/item/organ/internal/cyberimp/brain/anti_stun, /obj/item/organ/internal/cyberimp/chest/reviver)
var/amount = 5
/obj/item/weapon/storage/box/cyber_implants/bundle/New()
/obj/item/storage/box/cyber_implants/bundle/New()
..()
var/implant
while(contents.len <= amount + 1) // +1 for the autoimplanter.
code/modules/surgery/organs/autoimplanter.dm
+1 -1
View File
@@ -26,7 +26,7 @@
I.forceMove(src)
storedorgan = I
to_chat(user, "<span class='notice'>You insert the [I] into [src].</span>")
else if(istype(I, /obj/item/weapon/screwdriver))
else if(istype(I, /obj/item/screwdriver))
if(!storedorgan)
to_chat(user, "<span class='notice'>There's no implant in [src] for you to remove.</span>")
else
code/modules/surgery/organs/helpers.dm
+2 -2
View File
@@ -104,8 +104,8 @@
if(flying == 1)
return TRUE
var/obj/item/weapon/tank/jetpack/J
if(istype(back,/obj/item/weapon/tank/jetpack))
var/obj/item/tank/jetpack/J
if(istype(back,/obj/item/tank/jetpack))
J = back
if(J.on == 1)
return TRUE
code/modules/surgery/organs/organ_internal.dm
+4 -4
View File
@@ -92,7 +92,7 @@
/obj/item/organ/internal/proc/prepare_eat()
if(status == ORGAN_ROBOT)
return //no eating cybernetic implants!
var/obj/item/weapon/reagent_containers/food/snacks/organ/S = new
var/obj/item/reagent_containers/food/snacks/organ/S = new
S.name = name
S.desc = desc
S.icon = icon
@@ -108,12 +108,12 @@
insert(H)
return 1
/obj/item/weapon/reagent_containers/food/snacks/organ
/obj/item/reagent_containers/food/snacks/organ
name = "appendix"
icon_state = "appendix"
icon = 'icons/obj/surgery.dmi'
/obj/item/weapon/reagent_containers/food/snacks/organ/New()
/obj/item/reagent_containers/food/snacks/organ/New()
..()
reagents.add_reagent("nutriment", 5)
@@ -121,7 +121,7 @@
/obj/item/organ/internal/attack(mob/living/carbon/M, mob/user)
if(M == user && ishuman(user))
var/mob/living/carbon/human/H = user
var/obj/item/weapon/reagent_containers/food/snacks/S = prepare_eat()
var/obj/item/reagent_containers/food/snacks/S = prepare_eat()
if(S)
H.drop_item()
H.put_in_active_hand(S)
code/modules/surgery/organs/skeleton.dm
+10 -10
View File
@@ -1,50 +1,50 @@
/obj/item/weapon/skeleton
/obj/item/skeleton
name ="skeleton"
desc = "skeleton parent object."
icon = 'icons/mob/human_races/r_skeleton.dmi'
/obj/item/weapon/skeleton/head
/obj/item/skeleton/head
name = "skull"
desc = "a skeleton skull, would make a nice paperweight."
icon_state = "head"
/obj/item/weapon/skeleton/r_hand
/obj/item/skeleton/r_hand
name = "skeleton right hand"
desc = "a skeleton right hand."
icon_state = "r_hand"
/obj/item/weapon/skeleton/r_arm
/obj/item/skeleton/r_arm
name = "skeleton right arm"
desc = "a skeleton right arm."
icon_state = "r_arm"
/obj/item/weapon/skeleton/l_hand
/obj/item/skeleton/l_hand
name = "skeleton left hand"
desc = "a skeleton left hand."
icon_state = "l_hand"
/obj/item/weapon/skeleton/l_arm
/obj/item/skeleton/l_arm
name = "skeleton left arm"
desc = "a skeleton left arm."
icon_state = "l_arm"
/obj/item/weapon/skeleton/r_foot
/obj/item/skeleton/r_foot
name = "skeleton right foot"
desc = "a skeleton right foot."
icon_state = "r_foot"
/obj/item/weapon/skeleton/r_leg
/obj/item/skeleton/r_leg
name = "skeleton right leg"
desc = "a skeleton right leg"
icon_state = "r_leg"
/obj/item/weapon/skeleton/l_foot
/obj/item/skeleton/l_foot
name = "skeleton left foot"
desc = "a skeleton left foot"
icon_state = "l_foot"
/obj/item/weapon/skeleton/l_leg
/obj/item/skeleton/l_leg
name = "skeleton left leg"
desc = "a skeleton left leg"
icon_state = "l_leg"
code/modules/surgery/organs/subtypes/skrell.dm
+2 -2
View File
@@ -12,11 +12,11 @@
slot = "headpocket"
species = "Skrell"
actions_types = list(/datum/action/item_action/organ_action/toggle)
var/obj/item/weapon/storage/internal/pocket
var/obj/item/storage/internal/pocket
/obj/item/organ/internal/headpocket/New()
..()
pocket = new /obj/item/weapon/storage/internal(src)
pocket = new /obj/item/storage/internal(src)
pocket.storage_slots = 1
// Allow adjacency calculation to work properly
loc = owner