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

TG: Added Cheridan's hatchets!

Browse Source 
Buffed stamped packing slips to be worth 2 supply points.
Revision: r3298
Author: 	 petethegoat
This commit is contained in:
Ren Erthilo
2012-04-27 00:36:33 +01:00
parent 2b9324f1ef
commit 7b119b422a
4 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/supplypacks.dm
+1
View File
@@ -366,6 +366,7 @@
"/obj/item/weapon/plantbgone",
"/obj/item/weapon/plantbgone",
"/obj/item/weapon/plantbgone",
"/obj/item/weapon/hatchet",
"/obj/item/weapon/minihoe",
"/obj/item/device/analyzer/plant_analyzer",
"/obj/item/clothing/gloves/botanic_leather",
code/game/events/EventProcs/spacevines.dm
+1 -1
View File
@@ -26,7 +26,7 @@
if(/obj/item/weapon/kitchen/utensil/knife) del src
if(/obj/item/weapon/scalpel) del src
if(/obj/item/weapon/fireaxe) del src
// if(/obj/item/weapon/hatchet) del src
if(/obj/item/weapon/hatchet) del src
if(/obj/item/weapon/melee/energy) del src
//less effective weapons
code/game/objects/storage/crates.dm
+5 -12
View File
@@ -144,17 +144,6 @@
icon_opened = "hydrocrateopen"
icon_closed = "hydrocrate"
density = 1
/* New() // This stuff shouldn't be here, it should be in /datum/supply_packs/hydroponics
..()
new /obj/item/weapon/plantbgone(src)
new /obj/item/weapon/plantbgone(src)
new /obj/item/weapon/plantbgone(src)
new /obj/item/weapon/minihoe(src)
new /obj/item/weapon/weedspray(src)
new /obj/item/weapon/weedspray(src)
new /obj/item/weapon/pestspray(src)
new /obj/item/weapon/pestspray(src)
new /obj/item/weapon/pestspray(src) */
/obj/structure/closet/crate/hydroponics/prespawned
//This exists so the prespawned hydro crates spawn with their contents.
@@ -170,6 +159,7 @@
new /obj/item/weapon/plantbgone(src)
new /obj/item/weapon/plantbgone(src)
new /obj/item/weapon/plantbgone(src)
new /obj/item/weapon/hatchet(src)
new /obj/item/weapon/minihoe(src)
// new /obj/item/weapon/weedspray(src)
// new /obj/item/weapon/weedspray(src)
@@ -217,6 +207,7 @@
for(var/obj/O in src)
O.loc = get_turf(src)
for(var/mob/M in src)
M.loc = get_turf(src)
@@ -225,9 +216,11 @@
/obj/structure/closet/crate/close()
playsound(src.loc, 'click.ogg', 15, 1, -3)
for(var/obj/O in get_turf(src))
if(O.density || O.anchored || O == src) continue
O.loc = src
icon_state = icon_closed
src.opened = 0
@@ -286,7 +279,7 @@
user.drop_item()
if(W)
W.loc = src.loc
else if(istype(W,/obj/item/weapon/packageWrap))
else if(istype(W, /obj/item/weapon/packageWrap))
return
else return attack_hand(user)
code/game/supplyshuttle.dm
+3 -2
View File
@@ -7,7 +7,7 @@
#define SUPPLY_POINTSPERCRATE 5 //Points per crate sent back.
#define SUPPLY_STATION_AREATYPE "/area/supply/station" //Type of the supply shuttle area for station
#define SUPPLY_DOCK_AREATYPE "/area/supply/dock" //Type of the supply shuttle area for dock
#define SUPPLY_POINTSPERSLIP 1 //points per packing slip sent back stamped.
#define SUPPLY_POINTSPERSLIP 2 //points per packing slip sent back stamped.
var/supply_shuttle_moving = 0
var/supply_shuttle_at_station = 0
@@ -37,7 +37,7 @@ var/list/supply_groups = new()
//SUPPLY PACKS MOVED TO /code/defines/obj/supplypacks.dm
/obj/structure/plasticflaps //HOW DO YOU CALL THOSE THINGS ANYWAY
name = "Plastic flaps"
name = "\improper Plastic flaps"
desc = "Durable plastic flaps."
icon = 'stationobjs.dmi' //Change this.
icon_state = "plasticflaps"
@@ -162,6 +162,7 @@ var/list/supply_groups = new()
supply_shuttle_moving = 0
send_supply_shuttle()
/proc/supply_can_move()
if(supply_shuttle_moving) return 0