cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

More map stuff.

Browse Source
This commit is contained in:
Arokha Sieyes
2017-03-03 00:19:15 -05:00
parent a3e5e7327f
commit ee25004483
6 changed files with 45 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
code/game/machinery/vending_vr.dm
View File

@@ -48,41 +48,36 @@
/obj/item/weapon/storage/toolbox/lunchbox/syndicate = 3,
/obj/item/trash/bowl = 30)
contraband = list(/obj/item/weapon/material/knife/butch = 2)
/*
var/list/log = list()
var/req_log_access = access_armory
/obj/machinery/vending/security/vend(datum/stored_item/vending_product/R, mob/user)
if (..())
if(user.GetIdCard())
var/obj/item/weapon/card/id/tempid = user.GetIdCard()
var/list/list_item = list()
list_item += tempid.registered_name
list_item += stationtime2text()
list_item += R.item_name
log[++log.len] = list_item
/obj/machinery/vending/security/proc/show_log(mob/user as mob)
if(user.GetIdCard())
var/obj/item/weapon/card/id/tempid = user.GetIdCard()
if(req_log_access in tempid.GetAccess())
var/datum/browser/popup = new(user, "vending_log", "Vending Log", 700, 500)
var/dat = ""
dat += "<center><span style='font-size:24pt'><b>SecTech Vending Log</b></span></center>"
dat += "<center><span style='font-size:16pt'>Welcome [user.name]!</span></center><br>"
dat += "<span style='font-size:8pt'>Below are the recent vending logs for your vending machine.</span><br>"
for(var/i in log)
dat += json_encode(i)
dat += ";<br>"
popup.set_content(dat)
popup.open()
else
to_chat(user,"<span class='warning'>You do not have the required access to view the vending logs for this machine.</span>")
/obj/machinery/vending/security/verb/check_logs()
set name = "Check Vending Logs"
set category = "Object"
set src in oview(1)
show_log(usr)
*/ //Polaris ported all of this.
//I want this not just as part of the zoo. ;v
/obj/machinery/vending/food
name = "Food-O-Mat"
desc = "A technological marvel, supposedly able to cook or mix a large variety of food or drink."
icon_state = "boozeomat"
icon_deny = "boozeomat-deny"
products = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice = 4,
/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice = 4,
/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice = 4,
/obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 4,
/obj/item/weapon/reagent_containers/food/drinks/milk = 4,
/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 8,
/obj/item/weapon/reagent_containers/food/drinks/cans/sodawater = 15,
/obj/item/weapon/reagent_containers/food/drinks/flask/barflask = 2,
/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask = 2,
/obj/item/weapon/reagent_containers/food/drinks/ice = 9,
/obj/item/weapon/reagent_containers/food/drinks/tea = 10,
/obj/item/weapon/reagent_containers/food/snacks/appletart = 4,
/obj/item/weapon/reagent_containers/food/snacks/cheeseburger = 10,
/obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice = 10,
/obj/item/weapon/reagent_containers/food/snacks/grilledcheese = 10,
/obj/item/weapon/reagent_containers/food/snacks/hotdog = 10,
/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato = 10,
/obj/item/weapon/reagent_containers/food/snacks/margheritaslice = 10,
/obj/item/weapon/reagent_containers/food/snacks/muffin = 10,
/obj/item/weapon/reagent_containers/food/snacks/omelette = 10,
/obj/item/weapon/reagent_containers/food/snacks/pastatomato = 10,
/obj/item/weapon/reagent_containers/food/snacks/tofuburger = 10,
/obj/item/weapon/reagent_containers/food/snacks/waffles = 10
)
contraband = list(/obj/item/weapon/reagent_containers/food/snacks/mysterysoup = 10)
vend_delay = 15

32
maps/RandomZLevels/zoo.dm
View File

@@ -18,38 +18,6 @@
/area/awaymission/zoo/pirateship
icon_state = "bluenew"
/obj/machinery/vending/food
name = "Food-O-Mat"
desc = "A technological marvel, supposedly able to cook or mix a large variety of food or drink."
icon_state = "boozeomat"
icon_deny = "boozeomat-deny"
products = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice = 4,
/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice = 4,
/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice = 4,
/obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 4,
/obj/item/weapon/reagent_containers/food/drinks/milk = 4,
/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 8,
/obj/item/weapon/reagent_containers/food/drinks/cans/sodawater = 15,
/obj/item/weapon/reagent_containers/food/drinks/flask/barflask = 2,
/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask = 2,
/obj/item/weapon/reagent_containers/food/drinks/ice = 9,
/obj/item/weapon/reagent_containers/food/drinks/tea = 10,
/obj/item/weapon/reagent_containers/food/snacks/appletart = 4,
/obj/item/weapon/reagent_containers/food/snacks/cheeseburger = 10,
/obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice = 10,
/obj/item/weapon/reagent_containers/food/snacks/grilledcheese = 10,
/obj/item/weapon/reagent_containers/food/snacks/hotdog = 10,
/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato = 10,
/obj/item/weapon/reagent_containers/food/snacks/margheritaslice = 10,
/obj/item/weapon/reagent_containers/food/snacks/muffin = 10,
/obj/item/weapon/reagent_containers/food/snacks/omelette = 10,
/obj/item/weapon/reagent_containers/food/snacks/pastatomato = 10,
/obj/item/weapon/reagent_containers/food/snacks/tofuburger = 10,
/obj/item/weapon/reagent_containers/food/snacks/waffles = 10
)
contraband = list(/obj/item/weapon/reagent_containers/food/snacks/mysterysoup = 10)
vend_delay = 15
/obj/item/weapon/paper/zoo
name = "\improper Quarterly Report"
info = {"<i>There's nothing but spreadsheets and budget reports on this document, apparently regarding a zoo owned by NanoTrasen.</i>"}

5
maps/virgo/virgo-2.dmm
View File

@@ -1297,8 +1297,8 @@
"ayW" = (/obj/structure/table/rack,/obj/item/ammo_magazine/a10mm,/obj/item/ammo_magazine/a10mm,/obj/item/ammo_magazine/a10mm,/obj/item/ammo_magazine/a10mm,/obj/item/ammo_magazine/a10mm,/obj/item/ammo_magazine/a10mm,/obj/item/weapon/gun/projectile/automatic/c20r,/obj/item/weapon/gun/projectile/automatic/c20r,/obj/item/weapon/gun/projectile/automatic/c20r,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership)
"ayX" = (/obj/structure/table/rack,/obj/item/ammo_magazine/c762,/obj/item/ammo_magazine/c762,/obj/item/ammo_magazine/c762,/obj/item/ammo_magazine/c762,/obj/item/weapon/gun/projectile/automatic/sts35,/obj/item/weapon/gun/projectile/automatic/sts35,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership)
"ayY" = (/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops)
"ayZ" = (/obj/machinery/vending/boozeomat,/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/shuttle/administration/centcom)
"aza" = (/obj/machinery/vending/snack,/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/shuttle/administration/centcom)
"ayZ" = (/obj/machinery/vending/boozeomat{req_access = list()},/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/shuttle/administration/centcom)
"aza" = (/obj/machinery/vending/food,/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/shuttle/administration/centcom)
"azb" = (/obj/machinery/light{dir = 1},/obj/structure/table/reinforced,/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/shuttle/administration/centcom)
"azc" = (/obj/machinery/microwave,/obj/structure/table/reinforced,/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/shuttle/administration/centcom)
"azd" = (/turf/simulated/shuttle/wall{dir = 2; icon_state = "wall3_straight"; tag = "icon-swall_straight (EAST)"},/area/shuttle/administration/centcom)
@@ -3106,3 +3106,4 @@ arnarnarnarnarnarnarnarnarnarnarnarnarnarnarnarnarnarnarnarnarnarnarnarnarnarnar
aaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaP
aaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaP
"}

2
tools/mapmerge/1prepare_map.bat
View File

@@ -1,4 +1,4 @@
cd ../../maps
cd ../../maps/virgo
FOR %%f IN (*.dmm) DO (
copy %%f %%f.backup

6
tools/mapmerge/2clean_map.bat
View File

@@ -1,8 +1,8 @@
SET z_levels=6
SET z_levels=7
cd
FOR %%f IN (../../maps/*.dmm) DO (
java -jar MapPatcher.jar -clean ../../maps/%%f.backup ../../maps/%%f ../../maps/%%f
FOR %%f IN (../../maps/virgo/*.dmm) DO (
java -jar MapPatcher.jar -clean ../../maps/virgo/%%f.backup ../../maps/virgo/%%f ../../maps/virgo/%%f
)
pause

6
vorestation.dme
View File

@@ -2376,6 +2376,12 @@
#include "code\ZAS\Zone.dm"
#include "interface\interface.dm"
#include "interface\skin.dmf"
#include "maps\RandomZLevels\beach.dm"
#include "maps\RandomZLevels\blackmarketpackers.dm"
#include "maps\RandomZLevels\carpfarm.dm"
#include "maps\RandomZLevels\listeningpost.dm"
#include "maps\RandomZLevels\snowfield.dm"
#include "maps\RandomZLevels\zoo.dm"
#include "maps\virgo\virgo.dm"
#include "maps\virgo\virgo_defines.dm"
#include "maps\~map_system\maps.dm"