cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 07:03:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes no cooldown on shutdown drones, adds wood tiles and rglass to drone module, changes how regenerating resources work slightly.

Browse Source 
Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
This commit is contained in:
Zuhayr
2014-05-13 02:12:05 +09:30
committed by ZomgPonies
parent 1944048870
commit e87f4afbf2
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/drone/drone.dm
+3 -1
View File
@@ -212,6 +212,8 @@
/mob/living/silicon/robot/drone/handle_regular_status_updates()
if(health <= -35 && src.stat != 2)
timeofdeath = world.time
death() //Possibly redundant, having trouble making death() cooperate.
gib()
return
..()
@@ -257,7 +259,7 @@
/mob/living/silicon/robot/drone/proc/request_player()
for(var/mob/dead/observer/O in player_list)
if(jobban_isbanned(O, "Maintenance Drone"))
if(jobban_isbanned(O, "Cyborg"))
continue
if(O.client)
if(O.client.prefs.be_special & BE_PAI)
code/modules/mob/living/silicon/robot/robot_modules.dm
+19 -15
View File
@@ -252,7 +252,17 @@
/obj/item/weapon/robot_module/drone
name = "drone module"
var/list/stacktypes = list(
/obj/item/stack/sheet/wood/cyborg = 1,
/obj/item/stack/sheet/mineral/plastic/cyborg = 1,
/obj/item/stack/sheet/rglass/cyborg = 5,
/obj/item/stack/tile/wood = 5,
/obj/item/stack/rods = 15,
/obj/item/stack/tile/plasteel = 15,
/obj/item/stack/sheet/metal/cyborg = 20,
/obj/item/stack/sheet/glass/cyborg = 20,
/obj/item/stack/cable_coil = 30
)
New()
//TODO: Replace with shittier flashlight and work out why we can't remove the flash. ~Z
@@ -271,17 +281,6 @@
src.emag = new /obj/item/weapon/card/emag(src)
src.emag.name = "Cryptographic Sequencer"
var/list/stacktypes = list(
/obj/item/stack/rods = 10,
/obj/item/stack/tile/plasteel = 10,
/obj/item/stack/sheet/metal/cyborg = 10,
/obj/item/stack/sheet/wood/cyborg = 1,
/obj/item/stack/cable_coil = 30,
/obj/item/stack/sheet/glass/cyborg = 10,
/obj/item/stack/sheet/mineral/plastic/cyborg = 1
)
for(var/T in stacktypes)
var/obj/item/stack/sheet/W = new T(src)
W.amount = stacktypes[T]
@@ -298,7 +297,9 @@
/obj/item/stack/cable_coil,
/obj/item/stack/sheet/glass/cyborg,
/obj/item/stack/rods,
/obj/item/stack/tile/plasteel
/obj/item/stack/sheet/rglass/cyborg,
/obj/item/stack/tile/plasteel,
/obj/item/stack/tile/wood
)
for(var/T in stacks)
@@ -309,9 +310,12 @@
src.modules -= null
S = new T(src)
src.modules += S
S.amount = 0
S.amount = 1
var/max = 15
if(stacktypes[T])
max = stacktypes[T]
if(S && S.amount < 15)
if(S && S.amount < max)
S.amount++
var/obj/item/device/lightreplacer/LR = locate() in src.modules