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/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,