cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2025-12-09 21:53:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Skub vs Anti-Skub

Browse Source
This commit is contained in:
Captain277
2021-02-19 23:56:24 -08:00
parent ac5a2e9c94
commit 2e38099614
4 changed files with 63 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/game/objects/items/contraband.dm
View File

@@ -209,3 +209,12 @@
new loot(usr.drop_location())
to_chat(user, "You unwrap the package.")
qdel(src)
//Ported from Main.
/obj/item/skub
name = "skub"
desc = "A standard jar of skub."
icon = 'icons/obj/items.dmi'
icon_state = "skub"
attack_verb = list("skubbed")

BIN
icons/obj/items.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 67 KiB

54
maps/nsv_triumph/submaps/lavaland/lavaland.dmm
View File

@@ -133,6 +133,9 @@
},
/obj/structure/grille,
/obj/structure/window/phoronreinforced/full,
/obj/machinery/door/firedoor{
req_one_access = list(48)
},
/turf/simulated/floor/plating,
/area/lavaland/base/common)
"fh" = (
@@ -708,8 +711,8 @@
/turf/simulated/floor/plating,
/area/lavaland/base/common)
"qb" = (
/obj/machinery/atmospherics/pipe/simple/visible/red{
dir = 6
/obj/machinery/atmospherics/unary/outlet_injector{
dir = 4
},
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/base/common)
@@ -1074,6 +1077,9 @@
id = "wind_blue"
},
/obj/structure/window/reinforced/full,
/obj/machinery/door/firedoor{
req_one_access = list(48)
},
/turf/simulated/floor/plating,
/area/lavaland/base/common)
"yI" = (
@@ -1160,7 +1166,7 @@
/obj/machinery/light/small{
dir = 8
},
/obj/structure/ore_box,
/obj/machinery/mining/drill,
/turf/simulated/floor/tiled/dark,
/area/lavaland/base/common)
"AG" = (
@@ -1510,10 +1516,6 @@
},
/turf/simulated/floor/wood,
/area/lavaland/base/common)
"GZ" = (
/obj/structure/closet/crate/freezer/rations,
/turf/simulated/floor/wood,
/area/lavaland/base/common)
"Hr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -1970,6 +1972,9 @@
dir = 8
},
/obj/structure/window/reinforced/full,
/obj/machinery/door/firedoor{
req_one_access = list(48)
},
/turf/simulated/floor/plating,
/area/lavaland/base/common)
"TJ" = (
@@ -2007,7 +2012,15 @@
/obj/machinery/atmospherics/pipe/simple/visible/red{
dir = 4
},
/turf/simulated/wall/r_wall,
/obj/machinery/door/firedoor{
req_one_access = list(48)
},
/obj/structure/grille,
/obj/structure/window/phoronreinforced{
dir = 8
},
/obj/structure/window/phoronreinforced/full,
/turf/simulated/floor/plating,
/area/lavaland/base/common)
"UG" = (
/obj/structure/grille,
@@ -2016,6 +2029,9 @@
id = "wind_orange"
},
/obj/structure/window/reinforced/full,
/obj/machinery/door/firedoor{
req_one_access = list(48)
},
/turf/simulated/floor/plating,
/area/lavaland/base/common)
"UU" = (
@@ -2029,16 +2045,6 @@
/obj/machinery/meter,
/turf/simulated/floor/plating,
/area/lavaland/base/common)
"Vo" = (
/obj/machinery/atmospherics/unary/outlet_injector{
dir = 1;
frequency = 1441;
id = "mine_out";
power_rating = 5000;
use_power = 1
},
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/base/common)
"Vw" = (
/obj/machinery/recharge_station,
/turf/simulated/floor/tiled,
@@ -2103,7 +2109,9 @@
/turf/simulated/floor/reinforced/airmix,
/area/lavaland/base/common)
"Wh" = (
/obj/machinery/mining/drill,
/obj/machinery/mining/brace{
dir = 8
},
/turf/simulated/floor/tiled/dark,
/area/lavaland/base/common)
"Wj" = (
@@ -2260,7 +2268,9 @@
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/ore_box,
/obj/machinery/mining/brace{
dir = 8
},
/turf/simulated/floor/tiled/dark,
/area/lavaland/base/common)
"ZG" = (
@@ -7100,7 +7110,7 @@ MQ
MQ
MQ
qb
Vo
bx
MQ
MQ
Xq
@@ -7675,7 +7685,7 @@ fg
AO
xJ
wN
GZ
HB
HB
HB
HB

37
maps/nsv_triumph/submaps/lavaland/shelter.dmm
View File

@@ -13,6 +13,9 @@
/obj/effect/decal/remains/human,
/turf/simulated/floor/wood,
/area/lavaland/idleruins)
"i" = (
/turf/simulated/wall,
/area/template_noop)
"n" = (
/turf/simulated/wall,
/area/lavaland/idleruins)
@@ -28,6 +31,10 @@
/obj/structure/table/woodentable,
/turf/simulated/floor/wood,
/area/lavaland/idleruins)
"x" = (
/obj/structure/boulder,
/turf/simulated/floor/outdoors/lavaland,
/area/template_noop)
"y" = (
/obj/structure/boulder,
/turf/simulated/floor/wood,
@@ -69,9 +76,9 @@
},
/turf/simulated/floor/wood,
/area/lavaland/idleruins)
"V" = (
/obj/structure/boulder,
/turf/simulated/floor/outdoors/lavaland,
"W" = (
/obj/structure/bed/double,
/turf/simulated/floor/wood/broken,
/area/lavaland/idleruins)
"X" = (
/turf/simulated/floor/outdoors/lavaland,
@@ -91,24 +98,24 @@ a
"}
(2,1,1) = {"
a
a
a
a
a
a
a
a
x
i
i
i
i
i
i
a
a
"}
(3,1,1) = {"
a
V
n
n
n
n
n
d
d
W
d
B
n
a
a