shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kills off /obj/item/device (#6561)

Browse Source
This commit is contained in:
kevinz000
2018-04-29 22:06:58 -07:00
committed by Poojawa
parent ab3035a4ea
commit 3369c804b2
538 changed files with 6728 additions and 6707 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_civilian.dm
+1 -1
View File
@@ -127,7 +127,7 @@
/datum/objective/crew/slipster/check_completion()
var/list/uniqueslips = list()
if(owner && owner.current)
for(var/obj/item/device/pda/clown/PDA in owner.current.get_contents())
for(var/obj/item/pda/clown/PDA in owner.current.get_contents())
for(var/mob/living/carbon/human/H in PDA.slipvictims)
uniqueslips |= H
if(uniqueslips.len >= target_amount)
modular_citadel/code/modules/antagonists/crew_objectives/cit_crewobjectives_engineering.dm
+1 -1
View File
@@ -29,6 +29,6 @@
/datum/objective/crew/poly/check_completion()
for(var/mob/living/simple_animal/parrot/Poly/dumbbird in GLOB.mob_list)
if(!(dumbbird.stat == DEAD) && dumbbird.ears)
if(istype(dumbbird.ears, /obj/item/device/radio/headset))
if(istype(dumbbird.ears, /obj/item/radio/headset))
return TRUE
return FALSE
modular_citadel/code/modules/clothing/spacesuits/flightsuit.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/obj/item/device/flightpack
/obj/item/flightpack
armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 20, "fire" = 20, "acid" = 20)
/obj/item/clothing/suit/space/hardsuit/flightsuit
modular_citadel/code/modules/clothing/under/trek_under.dm
+10 -10
View File
@@ -99,9 +99,9 @@
body_parts_covered = CHEST|GROIN|ARMS
permeability_coefficient = 0.50
allowed = list(
/obj/item/device/flashlight, /obj/item/device/analyzer,
/obj/item/device/radio, /obj/item/tank/internals/emergency_oxygen,
/obj/item/reagent_containers/hypospray, /obj/item/device/healthanalyzer,/obj/item/reagent_containers/syringe,
/obj/item/flashlight, /obj/item/analyzer,
/obj/item/radio, /obj/item/tank/internals/emergency_oxygen,
/obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer,/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/glass/bottle/vial,/obj/item/reagent_containers/glass/beaker,
/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle, /obj/item/restraints/handcuffs,/obj/item/hypospray
)
@@ -146,20 +146,20 @@
body_parts_covered = CHEST|GROIN|ARMS
allowed = list(
/obj/item/tank/internals/emergency_oxygen,
/obj/item/device/flashlight,
/obj/item/device/analyzer,
/obj/item/device/radio,
/obj/item/flashlight,
/obj/item/analyzer,
/obj/item/radio,
/obj/item/gun,
/obj/item/melee/baton,
/obj/item/restraints/handcuffs,
/obj/item/reagent_containers/hypospray,
/obj/item/hypospray,
/obj/item/device/healthanalyzer,
/obj/item/healthanalyzer,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/glass/bottle/vial,
/obj/item/reagent_containers/glass/beaker,
/obj/item/storage/pill_bottle,
/obj/item/device/taperecorder)
/obj/item/taperecorder)
armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 5, "rad" = 10, "fire" = 10, "acid" = 0)
var/unbuttoned = 0
@@ -212,11 +212,11 @@
body_parts_covered = CHEST|GROIN|ARMS
allowed = list(
/obj/item/tank/internals/emergency_oxygen,
/obj/item/device/flashlight,
/obj/item/flashlight,
/obj/item/gun,
/obj/item/melee/baton,
/obj/item/restraints/handcuffs,
/obj/item/device/taperecorder)
/obj/item/taperecorder)
armor = list("melee" = 45, "bullet" = 25, "laser" = 25,"energy" = 25, "bomb" = 25, "bio" = 25, "rad" = 50, "fire" = 50, "acid" = 50)
//Variants
modular_citadel/code/modules/crafting/recipes.dm
+2 -2
View File
@@ -6,6 +6,6 @@
/datum/crafting_recipe/potatos
name = "Potat-OS"
reqs = list(/obj/item/stack/cable_coil = 1, /obj/item/stack/rods = 1, /obj/item/reagent_containers/food/snacks/grown/potato = 1, /obj/item/device/aicard = 1 )
result = /obj/item/device/aicard/potato
reqs = list(/obj/item/stack/cable_coil = 1, /obj/item/stack/rods = 1, /obj/item/reagent_containers/food/snacks/grown/potato = 1, /obj/item/aicard = 1 )
result = /obj/item/aicard/potato
category = CAT_ROBOT
modular_citadel/code/modules/jobs/job_types/cargo_service.dm
+2 -2
View File
@@ -15,8 +15,8 @@
/datum/outfit/job/quartermaster
id = /obj/item/card/id/silver
ears = /obj/item/device/radio/headset/heads/qm
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/device/modular_computer/tablet/preset/advanced = 1)
ears = /obj/item/radio/headset/heads/qm
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
/datum/job/cargo_tech
department_head = list("Quartermaster")
modular_citadel/code/modules/mob/living/carbon/human/life.dm
+1 -1
View File
@@ -7,7 +7,7 @@
/mob/living/carbon/human/calculate_affecting_pressure(pressure)
if(ismob(loc))
return ONE_ATMOSPHERE
if(istype(loc, /obj/item/device/dogborg/sleeper))
if(istype(loc, /obj/item/dogborg/sleeper))
return ONE_ATMOSPHERE
. = ..()
modular_citadel/code/modules/mob/living/silicon/robot/dogborg archive.dm
+12 -12
View File
@@ -9,10 +9,10 @@
modules += new /obj/item/wrench(src)
modules += new /obj/item/crowbar(src)
modules += new /obj/item/wirecutters(src)
modules += new /obj/item/device/multitool(src)
modules += new /obj/item/device/t_scanner(src)
modules += new /obj/item/device/analyzer(src)
modules += new /obj/item/device/assembly/signaler
modules += new /obj/item/multitool(src)
modules += new /obj/item/t_scanner(src)
modules += new /obj/item/analyzer(src)
modules += new /obj/item/assembly/signaler
modules += new /obj/item/soap/nanotrasen(src)
fix_modules()
@@ -26,10 +26,10 @@
modules += new /obj/item/dogborg/pounce(src)
modules += new /obj/item/clothing/mask/gas/sechailer/cyborg(src)
modules += new /obj/item/soap/tongue(src)
modules += new /obj/item/device/analyzer/nose(src)
modules += new /obj/item/analyzer/nose(src)
modules += new /obj/item/storage/bag/borgdelivery(src)
//modules += new /obj/item/device/assembly/signaler(src)
//modules += new /obj/item/device/detective_scanner(src)
//modules += new /obj/item/assembly/signaler(src)
//modules += new /obj/item/detective_scanner(src)
modules += new /obj/item/gun/energy/disabler/cyborg(src)
emag = new /obj/item/gun/energy/laser/cyborg(src)
fix_modules()
@@ -54,8 +54,8 @@
modules += new /obj/item/dogborg/jaws/small(src)
modules += new /obj/item/storage/bag/borgdelivery(src)
modules += new /obj/item/soap/tongue(src)
modules += new /obj/item/device/healthanalyzer(src)
modules += new /obj/item/device/analyzer/nose(src)
modules += new /obj/item/healthanalyzer(src)
modules += new /obj/item/analyzer/nose(src)
emag = new /obj/item/dogborg/pounce(src)
fix_modules()
@@ -66,11 +66,11 @@
..()
modules += new /obj/item/dogborg/jaws/small(src)
modules += new /obj/item/storage/bag/borgdelivery(src)
modules += new /obj/item/device/analyzer/nose(src)
modules += new /obj/item/analyzer/nose(src)
modules += new /obj/item/soap/tongue(src)
modules += new /obj/item/device/healthanalyzer(src)
modules += new /obj/item/healthanalyzer(src)
modules += new /obj/item/dogborg/sleeper(src)
modules += new /obj/item/twohanded/shockpaddles/hound(src)
modules += new /obj/item/device/sensor_device(src)
modules += new /obj/item/sensor_device(src)
emag = new /obj/item/dogborg/pounce(src)
fix_modules()
modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm
+3 -3
View File
@@ -82,7 +82,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
//Boop
/obj/item/device/analyzer/nose
/obj/item/analyzer/nose
name = "boop module"
icon = 'icons/mob/dogborg.dmi'
icon_state = "nose"
@@ -93,7 +93,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
attack_verb = list("nuzzled", "nosed", "booped")
w_class = 1
/obj/item/device/analyzer/nose/attack_self(mob/user)
/obj/item/analyzer/nose/attack_self(mob/user)
user.visible_message("[user] sniffs around the air.", "<span class='warning'>You sniff the air for gas traces.</span>")
var/turf/location = user.loc
@@ -148,7 +148,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
to_chat(user, "<span class='alert'>[env_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] %</span>")
to_chat(user, "<span class='info'>Temperature: [round(environment.temperature-T0C)] &deg;C</span>")
/obj/item/device/analyzer/nose/AltClick(mob/user) //Barometer output for measuring when the next storm happens
/obj/item/analyzer/nose/AltClick(mob/user) //Barometer output for measuring when the next storm happens
. = ..()
//Delivery
modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm
+16 -16
View File
@@ -36,8 +36,8 @@
/obj/item/dogborg/pounce,
/obj/item/clothing/mask/gas/sechailer/cyborg,
/obj/item/soap/tongue,
/obj/item/device/analyzer/nose,
/obj/item/device/dogborg/sleeper/K9,
/obj/item/analyzer/nose,
/obj/item/dogborg/sleeper/K9,
/obj/item/gun/energy/disabler/cyborg,
/obj/item/pinpointer/crew)
emag_modules = list(/obj/item/gun/energy/laser/cyborg)
@@ -63,14 +63,14 @@
basic_modules = list(
/obj/item/dogborg/jaws/small,
/obj/item/storage/bag/borgdelivery,
/obj/item/device/analyzer/nose,
/obj/item/analyzer/nose,
/obj/item/soap/tongue,
/obj/item/device/healthanalyzer,
/obj/item/device/dogborg/sleeper/medihound,
/obj/item/healthanalyzer,
/obj/item/dogborg/sleeper/medihound,
/obj/item/reagent_containers/borghypo,
/obj/item/twohanded/shockpaddles/cyborg/hound,
/obj/item/stack/medical/gauze/cyborg,
/obj/item/device/sensor_device)
/obj/item/sensor_device)
emag_modules = list(/obj/item/dogborg/pounce)
ratvar_modules = list(/obj/item/clockwork/slab/cyborg/medical,
/obj/item/clockwork/weapon/ratvarian_spear)
@@ -88,10 +88,10 @@
name = "Janitor"
basic_modules = list(
/obj/item/dogborg/jaws/small,
/obj/item/device/analyzer/nose,
/obj/item/analyzer/nose,
/obj/item/soap/tongue/scrubpup,
/obj/item/device/lightreplacer/cyborg,
/obj/item/device/dogborg/sleeper/compactor)
/obj/item/lightreplacer/cyborg,
/obj/item/dogborg/sleeper/compactor)
emag_modules = list(/obj/item/dogborg/pounce)
ratvar_modules = list(
/obj/item/clockwork/slab/cyborg/janitor,
@@ -108,7 +108,7 @@
/obj/item/robot_module/scrubpup/respawn_consumable(mob/living/silicon/robot/R, coeff = 1)
..()
var/obj/item/device/lightreplacer/LR = locate(/obj/item/device/lightreplacer) in basic_modules
var/obj/item/lightreplacer/LR = locate(/obj/item/lightreplacer) in basic_modules
if(LR)
for(var/i in 1 to coeff)
LR.Charge(R)
@@ -122,9 +122,9 @@
basic_modules = list(
/obj/item/dogborg/jaws/small,
/obj/item/storage/bag/borgdelivery,
/obj/item/device/analyzer/nose,
/obj/item/analyzer/nose,
/obj/item/soap/tongue,
/obj/item/device/healthanalyzer,
/obj/item/healthanalyzer,
/obj/item/borg/cyborghug)
emag_modules = list(/obj/item/dogborg/pounce)
ratvar_modules = list(
@@ -142,17 +142,17 @@
name = "Ore Pup"
basic_modules = list(
/obj/item/storage/bag/ore/cyborg,
/obj/item/device/analyzer/nose,
/obj/item/analyzer/nose,
/obj/item/storage/bag/borgdelivery,
/obj/item/device/dogborg/sleeper/ore,
/obj/item/dogborg/sleeper/ore,
/obj/item/pickaxe/drill/cyborg,
/obj/item/shovel,
/obj/item/crowbar/cyborg,
/obj/item/weldingtool/mini,
/obj/item/extinguisher/mini,
/obj/item/device/t_scanner/adv_mining_scanner,
/obj/item/t_scanner/adv_mining_scanner,
/obj/item/gun/energy/kinetic_accelerator/cyborg,
/obj/item/device/gps/cyborg)
/obj/item/gps/cyborg)
emag_modules = list(/obj/item/dogborg/pounce)
ratvar_modules = list(
/obj/item/clockwork/slab/cyborg/miner,
modular_citadel/code/modules/projectiles/guns/ballistic/flechette.dm
+1 -1
View File
@@ -63,7 +63,7 @@
item_state = "gun"
w_class = WEIGHT_CLASS_NORMAL
slot_flags = 0
/obj/item/device/firing_pin/implant/pindicate
/obj/item/firing_pin/implant/pindicate
mag_type = /obj/item/ammo_box/magazine/flechette/
fire_sound = 'sound/weapons/gunshot_smg.ogg'
can_suppress = 0
modular_citadel/code/modules/projectiles/guns/ballistic/handguns.dm
+1 -1
View File
@@ -28,7 +28,7 @@
/obj/item/gun/ballistic/automatic/pistol/antitank/syndicate
name = "Syndicate Anti Tank Pistol"
desc = "A massively impractical and silly monstrosity of a pistol that fires .50 calliber rounds. The recoil is likely to dislocate a variety of joints without proper bracing."
pin = /obj/item/device/firing_pin/implant/pindicate
pin = /obj/item/firing_pin/implant/pindicate
///foam stealth pistol///
modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm
+1 -1
View File
@@ -105,7 +105,7 @@
item_state = "gun"
w_class = WEIGHT_CLASS_NORMAL
slot_flags = 0
/obj/item/device/firing_pin/implant/pindicate
/obj/item/firing_pin/implant/pindicate
mag_type = /obj/item/ammo_box/magazine/flechette/
fire_sound = 'sound/weapons/gunshot_smg.ogg'
can_suppress = 0
modular_citadel/code/modules/vore/eating/digest_act_vr.dm
+4 -4
View File
@@ -31,9 +31,9 @@
return FALSE
/obj/item/disk/nuclear/digest_act(...)
return FALSE
/obj/item/device/perfect_tele_beacon/digest_act(...)
/obj/item/perfect_tele_beacon/digest_act(...)
return FALSE //Sorta important to not digest your own beacons.
/obj/item/device/pda/digest_act(...)
/obj/item/pda/digest_act(...)
return FALSE
/obj/item/gun/digest_act(...)
return FALSE
@@ -73,7 +73,7 @@
/////////////
/*
//PDAs need to lose their ID to not take it with them, so we can get a digested ID
/obj/item/device/pda/digest_act(var/atom/movable/item_storage = null)
/obj/item/pda/digest_act(var/atom/movable/item_storage = null)
if(id)
id = null
@@ -114,6 +114,6 @@
/////////////
// Some more complicated stuff
/////////////
/obj/item/device/mmi/digital/posibrain/digest_act(var/atom/movable/item_storage = null)
/obj/item/mmi/digital/posibrain/digest_act(var/atom/movable/item_storage = null)
//Replace this with a VORE setting so all types of posibrains can/can't be digested on a whim
return FALSE
modular_citadel/code/modules/vore/eating/living_vr.dm
+4 -4
View File
@@ -254,8 +254,8 @@
log_attack("[attacker] attempted to feed [H.contents] to [src] ([src.type]) but it failed.")
// I just can't imagine this not being complained about
//Handle case: /obj/item/device/radio/beacon
if(/obj/item/device/radio/beacon)
//Handle case: /obj/item/radio/beacon
if(/obj/item/radio/beacon)
var/confirm = alert(user, "[src == user ? "Eat the beacon?" : "Feed the beacon to [src]?"]", "Confirmation", "Yes!", "Cancel")
if(confirm == "Yes!")
var/bellychoice = input("Which belly?","Select A Belly") in src.vore_organs
@@ -333,8 +333,8 @@
SA.update_icons()
//You're in a dogborg!
else if(istype(loc, /obj/item/device/dogborg/sleeper))
var/obj/item/device/dogborg/sleeper/belly = loc //The belly!
else if(istype(loc, /obj/item/dogborg/sleeper))
var/obj/item/dogborg/sleeper/belly = loc //The belly!
var/confirm = alert(src, "You're in a dogborg sleeper. This is for escaping from preference-breaking or if your predator disconnects/AFKs. You can also resist out naturally too.", "Confirmation", "Okay", "Cancel")
if(!confirm == "Okay" || loc != belly)