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

Merge pull request #15713 from BlueWildrose/deltakinks

Browse Source 
Adds two additional certain vendors to Deltastation
This commit is contained in:
silicons
2022-07-23 14:28:44 -07:00
committed by GitHub
parent 7ccfc9970c c4070a41c0
commit d1e992ea21
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/Deltastation/DeltaStation2.dmm
+10 -8
View File
@@ -2619,9 +2619,8 @@
/turf/closed/wall/r_wall, /turf/closed/wall/r_wall,
/area/space/nearstation) /area/space/nearstation)
"ajs" = ( "ajs" = (
/obj/structure/table,
/obj/item/storage/briefcase,
/obj/effect/turf_decal/delivery, /obj/effect/turf_decal/delivery,
/obj/machinery/vending/kink,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/secondary/entry) /area/hallway/secondary/entry)
"ajt" = ( "ajt" = (
@@ -2880,15 +2879,17 @@
"ajR" = ( "ajR" = (
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery, /obj/effect/turf_decal/delivery,
/obj/item/kirbyplants{ /obj/structure/table,
icon_state = "plant-21" /obj/item/storage/briefcase,
},
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/secondary/entry) /area/hallway/secondary/entry)
"ajS" = ( "ajS" = (
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
dir = 8 dir = 8
}, },
/obj/item/kirbyplants{
icon_state = "plant-21"
},
/turf/open/floor/plasteel/cafeteria, /turf/open/floor/plasteel/cafeteria,
/area/hallway/secondary/entry) /area/hallway/secondary/entry)
"ajT" = ( "ajT" = (
@@ -96886,7 +96887,7 @@
/obj/item/folder/red, /obj/item/folder/red,
/obj/item/toy/gun, /obj/item/toy/gun,
/obj/item/clothing/head/beret/sec{ /obj/item/clothing/head/beret/sec{
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0); armor = list("melee"=0,"bullet"=0,"laser"=0,"energy"=0,"bomb"=0,"bio"=0,"rad"=0);
desc = "A replica beret resembling that of a special operations officer under Nanotrasen."; desc = "A replica beret resembling that of a special operations officer under Nanotrasen.";
name = "replica officer's beret" name = "replica officer's beret"
}, },
@@ -98957,7 +98958,7 @@
name = "Replica CentCom officer's jumpsuit" name = "Replica CentCom officer's jumpsuit"
}, },
/obj/item/clothing/head/centhat{ /obj/item/clothing/head/centhat{
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0); armor = list("melee"=0,"bullet"=0,"laser"=0,"energy"=0,"bomb"=0,"bio"=0,"rad"=0);
desc = "A replica hat of a Central Commander's attire. It has a small tag on it saying, 'It's good to be emperor.'"; desc = "A replica hat of a Central Commander's attire. It has a small tag on it saying, 'It's good to be emperor.'";
name = "Replica CentCom hat" name = "Replica CentCom hat"
}, },
@@ -114141,6 +114142,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 1 dir = 1
}, },
/obj/machinery/vending/kink,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/commons/fitness/recreation) /area/commons/fitness/recreation)
"sVM" = ( "sVM" = (
@@ -119427,7 +119429,7 @@
}, },
/obj/item/reagent_containers/food/drinks/beer{ /obj/item/reagent_containers/food/drinks/beer{
desc = "Whatever it is, it reeks of foul, putrid froth."; desc = "Whatever it is, it reeks of foul, putrid froth.";
list_reagents = list("bacchus_blessing" = 15); list_reagents = list("bacchus_blessing"=15);
name = "Delta-Down"; name = "Delta-Down";
pixel_x = 5; pixel_x = 5;
pixel_y = 5 pixel_y = 5