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

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI

Browse Source
This commit is contained in:
Aurorablade
2016-10-07 23:51:48 -04:00
parent 8023276f2a 835a8e16a8
commit 864a9ba612
44 changed files with 465 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/paicard.dm
+1 -1
View File
@@ -274,7 +274,7 @@
if(istype(P))
if(P.resting || P.canmove)
P.close_up()
M.death(0)
M.death(0, 1)
removePersonality()
if(href_list["wires"])
var/t1 = text2num(href_list["wires"])
code/game/objects/items/weapons/storage/belt.dm
-1
View File
@@ -142,7 +142,6 @@
"/obj/item/device/analyzer/plant_analyzer",
"/obj/item/weapon/minihoe",
"/obj/item/weapon/hatchet",
"/obj/item/weapon/reagent_containers/glass/fertilizer",
"/obj/item/weapon/reagent_containers/glass/bottle",
"/obj/item/weapon/plantspray",
// "/obj/item/weapon/reagent_containers/syringe",