Skip to content

Commit

Permalink
Rebase
Browse files Browse the repository at this point in the history
Rebase
  • Loading branch information
tichys committed Oct 7, 2020
1 parent 4f8fce0 commit 2538b5b
Show file tree
Hide file tree
Showing 806 changed files with 129,735 additions and 0 deletions.
63 changes: 63 additions & 0 deletions SQL/custom_items.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
-- phpMyAdmin SQL Dump
-- version 4.9.1
-- https://www.phpmyadmin.net/
--
-- Host: localhost
-- Generation Time: Jan 01, 2020 at 03:03 PM
-- Server version: 10.3.11-MariaDB
-- PHP Version: 7.2.11

SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
SET AUTOCOMMIT = 0;
START TRANSACTION;
SET time_zone = "+00:00";


/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!40101 SET NAMES utf8mb4 */;

--
-- Database: `tgstation`
--

-- --------------------------------------------------------

--
-- Table structure for table `role_whitelist`
--

CREATE TABLE `custom_items` (
`id` int NOT NULL,
`ckey` varchar(32) NOT NULL,
`charactername` varchar(250) NOT NULL,
`rolename` varchar(250) NOT NULL,
`itempath` varchar(250) NOT NULL,
`description` varchar(250)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;

--
-- Indexes for dumped tables
--

--
-- Indexes for table `role_whitelist`
--
ALTER TABLE `custom_items`
ADD PRIMARY KEY (`id`);

--
-- AUTO_INCREMENT for dumped tables
--

--
-- AUTO_INCREMENT for table `role_whitelist`
--
ALTER TABLE `custom_items`
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
COMMIT;

/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
60 changes: 60 additions & 0 deletions SQL/role_whitelist.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
-- phpMyAdmin SQL Dump
-- version 4.9.1
-- https://www.phpmyadmin.net/
--
-- Host: localhost
-- Generation Time: Jan 01, 2020 at 03:03 PM
-- Server version: 10.3.11-MariaDB
-- PHP Version: 7.2.11

SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
SET AUTOCOMMIT = 0;
START TRANSACTION;
SET time_zone = "+00:00";


/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!40101 SET NAMES utf8mb4 */;

--
-- Database: `tgstation`
--

-- --------------------------------------------------------

--
-- Table structure for table `role_whitelist`
--

CREATE TABLE `role_whitelist` (
`id` int NOT NULL,
`ckey` varchar(32) NOT NULL,
`whitelist` varchar(50) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1;

--
-- Indexes for dumped tables
--

--
-- Indexes for table `role_whitelist`
--
ALTER TABLE `role_whitelist`
ADD PRIMARY KEY (`id`);

--
-- AUTO_INCREMENT for dumped tables
--

--
-- AUTO_INCREMENT for table `role_whitelist`
--
ALTER TABLE `role_whitelist`
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
COMMIT;

/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
130 changes: 130 additions & 0 deletions _maps/RandomRooms/5x4/electronics.dmm
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/obj/structure/table/reinforced,
/obj/item/circuitboard/machine/sleeper{
pixel_x = 2;
pixel_y = 6
},
/obj/item/storage/secure/briefcase,
/obj/structure/sign/poster/official/random{
pixel_x = -32
},
/turf/open/floor/plating,
/area/template_noop)
"b" = (
/turf/open/floor/plating,
/area/template_noop)
"c" = (
/obj/item/electronics/apc,
/obj/structure/table/reinforced,
/obj/item/circuitboard/machine/smoke_machine{
pixel_x = 3;
pixel_y = 7
},
/turf/open/floor/plating,
/area/template_noop)
"d" = (
/obj/item/stack/cable_coil/white,
/obj/item/stack/cable_coil/white,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/obj/item/circuitboard/machine/microwave,
/obj/structure/table/reinforced,
/obj/machinery/light/small{
dir = 8
},
/turf/open/floor/plating,
/area/template_noop)
"e" = (
/obj/structure/chair/office/dark{
dir = 8
},
/turf/open/floor/plating,
/area/template_noop)
"f" = (
/obj/item/twohanded/required/kirbyplants/random,
/turf/open/floor/plating,
/area/template_noop)
"g" = (
/obj/structure/frame/computer,
/obj/item/stack/cable_coil/white,
/turf/open/floor/plating,
/area/template_noop)
"h" = (
/obj/item/electronics/airalarm,
/obj/item/electronics/airlock,
/obj/structure/table/reinforced,
/obj/item/storage/belt/utility/full/engi{
pixel_x = 2;
pixel_y = 7
},
/turf/open/floor/plating,
/area/template_noop)
"i" = (
/obj/item/electronics/firelock,
/obj/item/electronics/airlock,
/obj/structure/table/reinforced,
/obj/item/circuitboard/machine/pacman{
pixel_x = -6;
pixel_y = 8
},
/turf/open/floor/plating,
/area/template_noop)
"j" = (
/obj/machinery/autolathe{
name = "public autolathe"
},
/turf/open/floor/plating,
/area/template_noop)
"k" = (
/obj/structure/chair/office/dark{
dir = 4
},
/turf/open/floor/plating,
/area/template_noop)
"l" = (
/obj/structure/frame/computer,
/obj/item/circuitboard/computer/secure_data,
/turf/open/floor/plating,
/area/template_noop)
"m" = (
/obj/structure/table/reinforced,
/obj/item/stack/sheet/metal/twenty,
/obj/item/storage/fancy/donut_box,
/turf/open/floor/plating,
/area/template_noop)
"n" = (
/obj/structure/frame/machine,
/turf/open/floor/plating,
/area/template_noop)

(1,1,1) = {"
a
d
h
m
"}
(2,1,1) = {"
b
e
i
f
"}
(3,1,1) = {"
b
f
j
b
"}
(4,1,1) = {"
b
b
k
b
"}
(5,1,1) = {"
c
g
l
n
"}
112 changes: 112 additions & 0 deletions _maps/RandomRooms/5x4/surgery.dmm
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/obj/structure/chair,
/turf/open/floor/plating,
/area/template_noop)
"b" = (
/obj/machinery/iv_drip,
/turf/open/floor/plating,
/area/template_noop)
"c" = (
/turf/open/floor/plating,
/area/template_noop)
"d" = (
/obj/item/shard,
/obj/item/circuitboard/computer/operating,
/turf/open/floor/plating,
/area/template_noop)
"e" = (
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/structure/chair,
/obj/item/reagent_containers/blood/random,
/turf/open/floor/plating,
/area/template_noop)
"f" = (
/obj/item/wrench,
/turf/open/floor/plating,
/area/template_noop)
"g" = (
/obj/structure/table/optable{
name = "Robotics Operating Table"
},
/obj/item/surgical_drapes{
pixel_x = -3;
pixel_y = 9
},
/turf/open/floor/plating,
/area/template_noop)
"h" = (
/obj/machinery/sleeper{
dir = 4
},
/turf/open/floor/plating,
/area/template_noop)
"i" = (
/obj/structure/frame/computer,
/turf/open/floor/plating,
/area/template_noop)
"j" = (
/obj/item/storage/bag/trash,
/turf/open/floor/plating,
/area/template_noop)
"k" = (
/obj/structure/table/glass,
/obj/item/storage/bag/trash,
/obj/item/hemostat,
/turf/open/floor/plating,
/area/template_noop)
"l" = (
/obj/structure/closet/wardrobe/white,
/obj/item/clothing/shoes/jackboots,
/obj/item/reagent_containers/blood/random,
/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
/turf/open/floor/plating,
/area/template_noop)
"m" = (
/obj/item/shard,
/turf/open/floor/plating,
/area/template_noop)
"n" = (
/obj/structure/table/glass,
/obj/item/restraints/handcuffs/cable/zipties,
/obj/item/reagent_containers/blood/random,
/turf/open/floor/plating,
/area/template_noop)
"F" = (
/obj/structure/mirror{
icon_state = "mirror_broke";
pixel_x = 24
},
/turf/open/floor/plating,
/area/template_noop)

(1,1,1) = {"
a
c
h
l
"}
(2,1,1) = {"
b
f
c
c
"}
(3,1,1) = {"
c
g
i
c
"}
(4,1,1) = {"
d
c
j
m
"}
(5,1,1) = {"
e
F
k
n
"}
10 changes: 10 additions & 0 deletions _maps/StJeromesValley.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"map_name": "St. Jeromes Valley",
"map_path": "map_files/StJeromes",
"map_file": "StJeromesValley.dmm",
"shuttles": {
"cargo":"cargo_box",
"emergency": "emergency_box",
"ferry": "ferry_fancy"
}
}
Loading

0 comments on commit 2538b5b

Please sign in to comment.