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

Merge pull request #3458 from Citadel-Station-13/upstream-merge-31792

Browse Source 
[MIRROR] Corrects caravan ambush tool speed
This commit is contained in:
LetterJay
2017-10-18 07:34:27 -04:00
committed by GitHub
parent 7f9d13ab42 9dc849a674
commit ad35b9f65c
3 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/caravanambush.dmm
+4 -24
View File
@@ -735,30 +735,10 @@
/area/ruin/powered)
"cu" = (
/obj/structure/closet/crate/secure/engineering,
/obj/item/wrench{
color = "#ff0000";
desc = "A prototype of a new wrench design, allegedly the red color scheme makes it go faster.";
name = "experimental wrench";
toolspeed = 3
},
/obj/item/screwdriver{
color = "#ff0000";
desc = "A prototype of a new screwdriver design, allegedly the red color scheme makes it go faster.";
name = "experimental screwdriver";
toolspeed = 3
},
/obj/item/wirecutters{
color = "#ff0000";
desc = "A prototype of a new wirecutter design, allegedly the red color scheme makes it go faster.";
name = "experimental wirecutters";
toolspeed = 3
},
/obj/item/crowbar/red{
color = "#ff0000";
desc = "A prototype of a new crowbar design, allegedly the red color scheme makes it go faster.";
name = "experimental crowbar";
toolspeed = 3
},
/obj/item/wrench/caravan,
/obj/item/screwdriver/caravan,
/obj/item/wirecutters/caravan,
/obj/item/crowbar/red/caravan,
/turf/open/floor/mineral/plastitanium,
/area/ruin/powered)
"cv" = (
code/modules/ruins/spaceruin_code/caravanambush.dm
+27
View File
@@ -0,0 +1,27 @@
//caravan ambush
/obj/item/wrench/caravan
color = "#ff0000"
desc = "A prototype of a new wrench design, allegedly the red color scheme makes it go faster."
name = "experimental wrench"
toolspeed = 0.3
/obj/item/screwdriver/caravan
color = "#ff0000"
desc = "A prototype of a new screwdriver design, allegedly the red color scheme makes it go faster."
name = "experimental screwdriver"
toolspeed = 0.3
random_color = FALSE
/obj/item/wirecutters/caravan
color = "#ff0000"
desc = "A prototype of a new wirecutter design, allegedly the red color scheme makes it go faster."
name = "experimental wirecutters"
toolspeed = 0.3
random_color = FALSE
/obj/item/crowbar/red/caravan
color = "#ff0000"
desc = "A prototype of a new crowbar design, allegedly the red color scheme makes it go faster."
name = "experimental crowbar"
toolspeed = 0.3
tgstation.dme
+1
View File
@@ -2156,6 +2156,7 @@
#include "code\modules\ruins\objects_and_mobs\sin_ruins.dm"
#include "code\modules\ruins\spaceruin_code\asteroid4.dm"
#include "code\modules\ruins\spaceruin_code\bigderelict1.dm"
#include "code\modules\ruins\spaceruin_code\caravanambush.dm"
#include "code\modules\ruins\spaceruin_code\crashedclownship.dm"
#include "code\modules\ruins\spaceruin_code\crashedship.dm"
#include "code\modules\ruins\spaceruin_code\deepstorage.dm"