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

Merge remote-tracking branch 'Citadel-Station-13/master' into Citadel-Station-13/custom_roundstart_items

Browse Source
This commit is contained in:
kevinz000
2017-07-16 20:30:27 -07:00
parent 1013cfac25 c16b174200
commit df590fd8c1
1402 changed files with 636727 additions and 311525 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
+4
View File
@@ -0,0 +1,4 @@
[submodule "tools/tgstation-server"]
path = tools/tgstation-server
url = https://github.com/tgstation/tgstation-server
branch = master
README.md
+1 -7
View File
@@ -25,13 +25,7 @@ There are a number of ways to download the source code. Some are described here,
Option 1:
Follow this: http://www.tgstation13.org/wiki/Setting_up_git
Option 2:
Install GitHub::windows from http://windows.github.com/
It handles most of the setup and configuraton of Git for you.
Then you simply search for the tgstation repository and click the big clone
button.
Option 3: Download the source code as a zip by clicking the ZIP button in the
Option 2: Download the source code as a zip by clicking the ZIP button in the
code tab of https://github.com/tgstation/tgstation
(note: this will use a lot of bandwidth if you wish to update and is a lot of
hassle if you want to make any changes at all, so it's not recommended.)
SQL/database_changelog.txt
+22
View File
@@ -1,3 +1,25 @@
20 May 2017, by Jordie0608
Created table `round` to replace tracking of the datapoints 'round_start', 'round_end', 'server_ip', 'game_mode', 'round_end_results', 'end_error', 'end_proper', 'emergency_shuttle', 'map_name' and 'station_renames' in the `feedback` table.
Once created this table is populated with rows from the `feedback` table.
START TRANSACTION;
CREATE TABLE `feedback`.`round` (`id` INT(11) NOT NULL AUTO_INCREMENT, `start_datetime` DATETIME NOT NULL, `end_datetime` DATETIME NULL, `server_ip` INT(10) UNSIGNED NOT NULL, `server_port` SMALLINT(5) UNSIGNED NOT NULL, `commit_hash` CHAR(40) NULL, `game_mode` VARCHAR(32) NULL, `game_mode_result` VARCHAR(64) NULL, `end_state` VARCHAR(64) NULL, `shuttle_name` VARCHAR(64) NULL, `map_name` VARCHAR(32) NULL, `station_name` VARCHAR(80) NULL, PRIMARY KEY (`id`));
ALTER TABLE `feedback`.`feedback` ADD INDEX `tmp` (`round_id` ASC, `var_name` ASC);
INSERT INTO `feedback`.`round`
(`id`, `start_datetime`, `end_datetime`, `server_ip`, `server_port`, `commit_hash`, `game_mode`, `game_mode_result`, `end_state`, `shuttle_name`, `map_name`, `station_name`)
SELECT DISTINCT ri.round_id, IFNULL(STR_TO_DATE(st.details,'%a %b %e %H:%i:%s %Y'), TIMESTAMP(0)), STR_TO_DATE(et.details,'%a %b %e %H:%i:%s %Y'), IFNULL(INET_ATON(SUBSTRING_INDEX(IF(si.details = '', '0', IF(SUBSTRING_INDEX(si.details, ':', 1) LIKE '%_._%', si.details, '0')), ':', 1)), INET_ATON(0)), IFNULL(IF(si.details LIKE '%:_%', CAST(SUBSTRING_INDEX(si.details, ':', -1) AS UNSIGNED), '0'), '0'), ch.details, gm.details, mr.details, IFNULL(es.details, ep.details), ss.details, mn.details, sn.details
FROM `feedback`.`feedback`AS ri
LEFT JOIN `feedback`.`feedback` AS st ON ri.round_id = st.round_id AND st.var_name = "round_start" LEFT JOIN `feedback`.`feedback` AS et ON ri.round_id = et.round_id AND et.var_name = "round_end" LEFT JOIN `feedback`.`feedback` AS si ON ri.round_id = si.round_id AND si.var_name = "server_ip" LEFT JOIN `feedback`.`feedback` AS ch ON ri.round_id = ch.round_id AND ch.var_name = "revision" LEFT JOIN `feedback`.`feedback` AS gm ON ri.round_id = gm.round_id AND gm.var_name = "game_mode" LEFT JOIN `feedback`.`feedback` AS mr ON ri.round_id = mr.round_id AND mr.var_name = "round_end_result" LEFT JOIN `feedback`.`feedback` AS es ON ri.round_id = es.round_id AND es.var_name = "end_state" LEFT JOIN `feedback`.`feedback` AS ep ON ri.round_id = ep.round_id AND ep.var_name = "end_proper" LEFT JOIN `feedback`.`feedback` AS ss ON ri.round_id = ss.round_id AND ss.var_name = "emergency_shuttle" LEFT JOIN `feedback`.`feedback` AS mn ON ri.round_id = mn.round_id AND mn.var_name = "map_name" LEFT JOIN `feedback`.`feedback` AS sn ON ri.round_id = sn.round_id AND sn.var_name = "station_renames";
ALTER TABLE `feedback`.`feedback` DROP INDEX `tmp`;
COMMIT;
It's not necessary to delete the rows from the `feedback` table but henceforth these datapoints will be in the `round` table.
Remember to add a prefix to the table names if you use them
----------------------------------------------------
21 April 2017, by Jordie0608
Modified table 'player', adding the column 'accountjoindate', removing the column 'id' and making the column 'ckey' the primary key.
SQL/tgstation_schema.sql
+29 -2
View File
@@ -119,6 +119,7 @@ CREATE TABLE `connection_log` (
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `death`
--
@@ -129,10 +130,13 @@ DROP TABLE IF EXISTS `death`;
CREATE TABLE `death` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`pod` varchar(50) NOT NULL,
`coord` varchar(32) NOT NULL,
`x_coord` smallint(5) unsigned NOT NULL,
`y_coord` smallint(5) unsigned NOT NULL,
`z_coord` smallint(5) unsigned NOT NULL,
`mapname` varchar(32) NOT NULL,
`server_ip` int(10) unsigned NOT NULL,
`server_port` smallint(5) unsigned NOT NULL,
`round_id` int(11) NOT NULL
`tod` datetime NOT NULL COMMENT 'Time of death',
`job` varchar(32) NOT NULL,
`special` varchar(32) DEFAULT NULL,
@@ -140,7 +144,6 @@ CREATE TABLE `death` (
`byondkey` varchar(32) NOT NULL,
`laname` varchar(96) DEFAULT NULL,
`lakey` varchar(32) DEFAULT NULL,
`gender` enum('neuter','male','female','plural') NOT NULL,
`bruteloss` smallint(5) unsigned NOT NULL,
`brainloss` smallint(5) unsigned NOT NULL,
`fireloss` smallint(5) unsigned NOT NULL,
@@ -152,6 +155,7 @@ CREATE TABLE `death` (
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `feedback`
--
@@ -362,6 +366,29 @@ CREATE TABLE `poll_vote` (
KEY `idx_pvote_optionid_ckey` (`optionid`,`ckey`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `round`
--
DROP TABLE IF EXISTS `round`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `round` (
`id` INT(11) NOT NULL AUTO_INCREMENT,
`start_datetime` DATETIME NOT NULL,
`end_datetime` DATETIME NULL,
`server_ip` INT(10) UNSIGNED NOT NULL,
`server_port` SMALLINT(5) UNSIGNED NOT NULL,
`commit_hash` CHAR(40) NULL,
`game_mode` VARCHAR(32) NULL,
`game_mode_result` VARCHAR(64) NULL,
`end_state` VARCHAR(64) NULL,
`shuttle_name` VARCHAR(64) NULL,
`map_name` VARCHAR(32) NULL,
`station_name` VARCHAR(80) NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
SQL/tgstation_schema_prefixed.sql
+23
View File
@@ -362,6 +362,29 @@ CREATE TABLE `SS13_poll_vote` (
KEY `idx_pvote_optionid_ckey` (`optionid`,`ckey`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `SS13_round`
--
DROP TABLE IF EXISTS `SS13_round`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `SS13_round` (
`id` INT(11) NOT NULL AUTO_INCREMENT,
`start_datetime` DATETIME NOT NULL,
`end_datetime` DATETIME NULL,
`server_ip` INT(10) UNSIGNED NOT NULL,
`server_port` SMALLINT(5) UNSIGNED NOT NULL,
`commit_hash` CHAR(40) NULL,
`game_mode` VARCHAR(32) NULL,
`game_mode_result` VARCHAR(64) NULL,
`end_state` VARCHAR(64) NULL,
`shuttle_name` VARCHAR(64) NULL,
`map_name` VARCHAR(32) NULL,
`station_name` VARCHAR(80) NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
+315 -119
View File
@@ -13,7 +13,7 @@
"ad" = (
/obj/structure/flora/ausbushes/leafybush,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
/area/ruin/powered/beach)
"ae" = (
/obj/structure/table,
/obj/item/weapon/storage/toolbox/mechanical,
@@ -21,44 +21,47 @@
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/beach)
"af" = (
/obj/structure/table,
/obj/item/clothing/mask/gas,
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/beach)
"ag" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/beach)
"ah" = (
/obj/machinery/power/smes,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/beach)
"ai" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/beach)
"aj" = (
/turf/closed/wall/mineral/sandstone{
baseturf = /turf/open/floor/plating/beach/sand
},
/area/ruin/powered)
/area/ruin/powered/beach)
"ak" = (
/obj/structure/toilet,
/obj/effect/decal/sandeffect,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/beach)
"al" = (
/obj/structure/urinal{
pixel_y = 32
@@ -66,7 +69,7 @@
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/beach)
"am" = (
/obj/structure/urinal{
pixel_y = 32
@@ -75,13 +78,16 @@
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/beach)
"an" = (
/obj/item/device/flashlight/lantern,
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/beach)
"ao" = (
/obj/structure/sink{
dir = 4;
@@ -96,213 +102,219 @@
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/beach)
"ap" = (
/obj/structure/flora/ausbushes/sparsegrass,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
/area/ruin/powered/beach)
"aq" = (
/obj/structure/flora/ausbushes/sunnybush,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
/area/ruin/powered/beach)
"ar" = (
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
/area/ruin/powered/beach)
"as" = (
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/beach)
"at" = (
/obj/item/weapon/tank/internals/oxygen,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/beach)
"au" = (
/obj/effect/decal/sandeffect,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/beach)
"av" = (
/obj/machinery/door/airlock/hatch,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/beach)
"aw" = (
/obj/machinery/door/airlock/sandstone,
/turf/open/floor/wood,
/area/ruin/powered)
/area/ruin/powered/beach)
"ax" = (
/obj/structure/extinguisher_cabinet,
/turf/closed/wall/mineral/sandstone{
baseturf = /turf/open/floor/plating/beach/sand
},
/area/ruin/powered)
/area/ruin/powered/beach)
"ay" = (
/obj/machinery/door/airlock/hatch,
/obj/effect/decal/sandeffect,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/beach)
"az" = (
/obj/item/clothing/neck/necklace/dope,
/obj/item/weapon/reagent_containers/spray/spraytan,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
/area/ruin/powered/beach)
"aA" = (
/obj/effect/decal/sandeffect,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
/area/ruin/powered/beach)
"aB" = (
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 1
},
/turf/open/floor/plasteel/asteroid{
baseturf = /turf/open/floor/plating/beach/sand;
tag = "icon-asteroidwarning (NORTH)"
},
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 1
},
/area/ruin/powered)
/area/ruin/powered/beach)
"aC" = (
/turf/open/floor/wood,
/area/ruin/powered)
/area/ruin/powered/beach)
"aD" = (
/obj/structure/table,
/obj/item/weapon/storage/box/drinkingglasses,
/obj/item/weapon/storage/box/drinkingglasses,
/obj/item/weapon/reagent_containers/food/drinks/shaker,
/obj/item/weapon/storage/box/beakers,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/wood,
/area/ruin/powered)
/area/ruin/powered/beach)
"aE" = (
/obj/structure/table,
/obj/machinery/reagentgrinder,
/turf/open/floor/wood,
/area/ruin/powered)
/area/ruin/powered/beach)
"aF" = (
/obj/machinery/vending/boozeomat{
emagged = 1;
req_access_txt = "0"
},
/turf/open/floor/wood,
/area/ruin/powered)
/area/ruin/powered/beach)
"aG" = (
/obj/structure/table,
/obj/item/weapon/book/manual/barman_recipes,
/obj/item/weapon/reagent_containers/glass/rag,
/turf/open/floor/wood,
/area/ruin/powered)
/area/ruin/powered/beach)
"aH" = (
/obj/structure/table,
/obj/item/weapon/storage/box/donkpockets,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/wood,
/area/ruin/powered)
/area/ruin/powered/beach)
"aI" = (
/obj/structure/table,
/obj/machinery/microwave,
/turf/open/floor/wood,
/area/ruin/powered)
/area/ruin/powered/beach)
"aJ" = (
/obj/structure/closet/crate/bin,
/obj/item/weapon/tank/internals/emergency_oxygen,
/obj/item/trash/candy,
/obj/item/toy/talking/owl,
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 1
},
/turf/open/floor/plasteel/asteroid{
baseturf = /turf/open/floor/plating/beach/sand;
tag = "icon-asteroidwarning (NORTH)"
},
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 1
},
/area/ruin/powered)
/area/ruin/powered/beach)
"aK" = (
/turf/open/floor/plasteel/asteroid{
baseturf = /turf/open/floor/plating/beach/sand
},
/area/ruin/powered)
/area/ruin/powered/beach)
"aL" = (
/obj/effect/mob_spawn/human/bartender/alive{
name = "beach bum sleeper"
},
/turf/open/floor/wood,
/area/ruin/powered)
/area/ruin/powered/beach)
"aM" = (
/obj/structure/reagent_dispensers/beerkeg,
/turf/open/floor/wood,
/area/ruin/powered)
/area/ruin/powered/beach)
"aN" = (
/obj/machinery/vending/cigarette,
/turf/open/floor/plasteel/asteroid{
baseturf = /turf/open/floor/plating/beach/sand
},
/area/ruin/powered)
/area/ruin/powered/beach)
"aO" = (
/obj/structure/stacklifter,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
/area/ruin/powered/beach)
"aP" = (
/obj/structure/table/wood,
/turf/open/floor/wood,
/area/ruin/powered)
/area/ruin/powered/beach)
"aQ" = (
/obj/structure/table/wood,
/obj/item/device/flashlight/lamp,
/turf/open/floor/wood,
/area/ruin/powered)
/area/ruin/powered/beach)
"aR" = (
/obj/structure/table/wood,
/obj/item/weapon/reagent_containers/food/drinks/bottle/tequila,
/turf/open/floor/wood,
/area/ruin/powered)
/area/ruin/powered/beach)
"aS" = (
/obj/machinery/processor,
/turf/open/floor/wood,
/area/ruin/powered)
/area/ruin/powered/beach)
"aT" = (
/obj/machinery/vending/cola,
/turf/open/floor/plasteel/asteroid{
baseturf = /turf/open/floor/plating/beach/sand
},
/area/ruin/powered)
/area/ruin/powered/beach)
"aU" = (
/obj/effect/overlay/palmtree_l,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
/area/ruin/powered/beach)
"aV" = (
/obj/effect/mob_spawn/human/beach/alive{
flavour_text = "You're, like, totally a dudebro, bruh. Ch'yea. You came here, like, on spring break, hopin' to pick up some bangin' hot chicks, y'knaw?";
pocket2 = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/dank;
l_pocket = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/dank;
uniform = /obj/item/clothing/under/pants/youngfolksjeans
},
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
/area/ruin/powered/beach)
"aW" = (
/obj/structure/chair/stool,
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 1
},
/turf/open/floor/plasteel/asteroid{
baseturf = /turf/open/floor/plating/beach/sand;
tag = "icon-asteroidwarning (NORTH)"
},
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 1
},
/area/ruin/powered)
/area/ruin/powered/beach)
"aX" = (
/obj/structure/closet/secure_closet/freezer/meat,
/turf/open/floor/wood,
/area/ruin/powered)
/area/ruin/powered/beach)
"aY" = (
/obj/machinery/vending/snack,
/turf/open/floor/plasteel/asteroid{
baseturf = /turf/open/floor/plating/beach/sand
},
/area/ruin/powered)
/area/ruin/powered/beach)
"aZ" = (
/obj/effect/overlay/coconut,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
/area/ruin/powered/beach)
"ba" = (
/obj/machinery/light{
dir = 4;
@@ -316,24 +328,24 @@
"bb" = (
/obj/structure/weightlifter,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
/area/ruin/powered/beach)
"bc" = (
/obj/machinery/door/airlock/sandstone,
/obj/effect/decal/sandeffect,
/turf/open/floor/wood,
/area/ruin/powered)
/area/ruin/powered/beach)
"bd" = (
/obj/structure/closet/secure_closet/freezer/kitchen{
req_access = null
},
/turf/open/floor/wood,
/area/ruin/powered)
/area/ruin/powered/beach)
"be" = (
/obj/vehicle/scooter/skateboard{
dir = 4
},
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
/area/ruin/powered/beach)
"bf" = (
/obj/machinery/light{
icon_state = "tube1";
@@ -347,10 +359,10 @@
"bg" = (
/obj/structure/sign/barsign,
/turf/closed/wall/mineral/sandstone,
/area/ruin/powered)
/area/ruin/powered/beach)
"bh" = (
/turf/closed/wall/mineral/sandstone,
/area/ruin/powered)
/area/ruin/powered/beach)
"bi" = (
/turf/open/floor/plating/beach/sand{
density = 1;
@@ -365,14 +377,14 @@
/turf/open/floor/plasteel/asteroid{
baseturf = /turf/open/floor/plating/beach/sand
},
/area/ruin/powered)
/area/ruin/powered/beach)
"bk" = (
/obj/structure/table/wood,
/obj/item/weapon/reagent_containers/food/snacks/pastatomato,
/turf/open/floor/plasteel/asteroid{
baseturf = /turf/open/floor/plating/beach/sand
},
/area/ruin/powered)
/area/ruin/powered/beach)
"bl" = (
/obj/structure/chair/wood/normal{
icon_state = "wooden_chair";
@@ -381,7 +393,7 @@
/turf/open/floor/plasteel/asteroid{
baseturf = /turf/open/floor/plating/beach/sand
},
/area/ruin/powered)
/area/ruin/powered/beach)
"bm" = (
/mob/living/simple_animal/crab,
/turf/open/floor/plating/beach/sand{
@@ -456,7 +468,7 @@
"bx" = (
/obj/structure/flora/rock,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
/area/ruin/powered/beach)
"by" = (
/obj/machinery/door/airlock/sandstone,
/obj/effect/decal/sandeffect,
@@ -467,7 +479,7 @@
"bz" = (
/mob/living/simple_animal/crab,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
/area/ruin/powered/beach)
"bA" = (
/obj/structure/window/reinforced{
dir = 1
@@ -480,7 +492,7 @@
/obj/item/weapon/storage/firstaid,
/obj/item/weapon/storage/firstaid/brute,
/turf/open/floor/wood,
/area/ruin/powered)
/area/ruin/powered/beach)
"bB" = (
/obj/structure/window/reinforced{
dir = 4;
@@ -492,7 +504,7 @@
},
/obj/structure/chair/stool,
/turf/open/floor/wood,
/area/ruin/powered)
/area/ruin/powered/beach)
"bC" = (
/obj/structure/table/wood,
/obj/item/weapon/tank/internals/oxygen,
@@ -512,11 +524,11 @@
"bE" = (
/obj/item/weapon/reagent_containers/spray/spraytan,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
/area/ruin/powered/beach)
"bF" = (
/obj/item/toy/beach_ball,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
/area/ruin/powered/beach)
"bG" = (
/obj/structure/window/reinforced{
dir = 8
@@ -524,7 +536,7 @@
/obj/structure/window/reinforced,
/obj/item/device/megaphone,
/turf/open/floor/wood,
/area/ruin/powered)
/area/ruin/powered/beach)
"bH" = (
/obj/structure/window/reinforced{
dir = 4;
@@ -532,13 +544,13 @@
},
/obj/effect/mob_spawn/human/beach/alive{
flavour_text = "You're a spunky lifeguard! It's up to you to make sure nobody drowns or gets eaten by sharks and stuff.";
has_id = 1;
id = /obj/item/weapon/card/id;
id_access = "Medical Doctor";
id_job = "Lifeguard";
mob_gender = "female"
},
/turf/open/floor/wood,
/area/ruin/powered)
/area/ruin/powered/beach)
"bI" = (
/obj/structure/dresser,
/turf/open/floor/pod/dark{
@@ -548,11 +560,11 @@
"bJ" = (
/obj/structure/chair,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
/area/ruin/powered/beach)
"bK" = (
/obj/item/weapon/storage/backpack/dufflebag,
/obj/item/weapon/storage/backpack/duffelbag,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
/area/ruin/powered/beach)
"bL" = (
/obj/effect/decal/sandeffect{
density = 1
@@ -562,43 +574,227 @@
baseturf = /turf/open/floor/plating/lava/smooth;
density = 1
},
/area/ruin/powered)
/area/ruin/powered/beach)
"bM" = (
/turf/open/floor/plasteel/stairs/old,
/area/ruin/powered)
/area/ruin/powered/beach)
"bN" = (
/obj/structure/flora/ausbushes/reedbush,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
/area/ruin/powered/beach)
"bO" = (
/obj/item/device/camera,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
/area/ruin/powered/beach)
"bP" = (
/obj/item/weapon/reagent_containers/food/drinks/beer,
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
/area/ruin/powered/beach)
"bQ" = (
/obj/structure/flora/ausbushes/reedbush,
/turf/open/floor/plating/beach/coastline_t,
/area/ruin/powered)
/area/ruin/powered/beach)
"bR" = (
/turf/open/floor/plating/beach/coastline_t,
/area/ruin/powered)
/area/ruin/powered/beach)
"bS" = (
/obj/structure/flora/ausbushes/sparsegrass,
/turf/open/floor/plating/beach/coastline_t,
/area/ruin/powered)
/area/ruin/powered/beach)
"bT" = (
/turf/open/floor/plating/beach/coastline_b,
/area/ruin/powered)
/area/ruin/powered/beach)
"bU" = (
/turf/open/floor/plating/beach/water,
/area/ruin/powered)
/area/ruin/powered/beach)
"bV" = (
/obj/structure/flora/ausbushes/stalkybush,
/turf/open/floor/plating/beach/water,
/area/ruin/powered/beach)
"bW" = (
/turf/closed/wall/r_wall{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/beach)
"bX" = (
/turf/closed/wall/r_wall{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/beach)
"bY" = (
/turf/closed/wall/r_wall{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/beach)
"bZ" = (
/turf/closed/wall/r_wall{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/beach)
"ca" = (
/turf/closed/wall/r_wall{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/beach)
"cb" = (
/turf/closed/wall/r_wall{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/beach)
"cc" = (
/turf/closed/wall/r_wall{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/beach)
"cd" = (
/obj/machinery/light/small{
dir = 1
},
/turf/closed/wall/mineral/sandstone{
baseturf = /turf/open/floor/plating/beach/sand
},
/area/ruin/powered/beach)
"ce" = (
/obj/effect/decal/sandeffect,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"cf" = (
/obj/effect/decal/sandeffect,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"cg" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"ch" = (
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"ci" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"cj" = (
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 1
},
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel/asteroid{
baseturf = /turf/open/floor/plating/beach/sand;
tag = "icon-asteroidwarning (NORTH)"
},
/area/ruin/powered/beach)
"ck" = (
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 1
},
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel/asteroid{
baseturf = /turf/open/floor/plating/beach/sand;
tag = "icon-asteroidwarning (NORTH)"
},
/area/ruin/powered/beach)
"cl" = (
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"cm" = (
/obj/machinery/light/small{
brightness = 3;
dir = 8
},
/turf/open/floor/pod/dark{
baseturf = /turf/open/floor/plating/asteroid/basalt
},
/area/ruin/powered)
"cn" = (
/obj/effect/decal/sandeffect,
/obj/machinery/light/small{
dir = 4
},
/turf/open/floor/pod/dark{
baseturf = /turf/open/floor/plating/asteroid/basalt
},
/area/ruin/powered)
"co" = (
/obj/effect/decal/sandeffect,
/obj/machinery/light/small{
brightness = 3;
dir = 8
},
/turf/open/floor/pod/dark{
baseturf = /turf/open/floor/plating/asteroid/basalt
},
/area/ruin/powered)
"cp" = (
/obj/machinery/light/small{
dir = 4
},
/turf/open/floor/pod/dark{
baseturf = /turf/open/floor/plating/asteroid/basalt
},
/area/ruin/powered)
"cq" = (
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"cr" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"cs" = (
/obj/effect/overlay/palmtree_l,
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"ct" = (
/obj/machinery/light,
/turf/open/floor/plating/beach/water,
/area/ruin/powered/beach)
"cu" = (
/obj/machinery/light,
/turf/open/floor/plating/beach/water,
/area/ruin/powered/beach)
"cv" = (
/obj/machinery/light,
/turf/open/floor/plating/beach/water,
/area/ruin/powered/beach)
"cw" = (
/obj/machinery/light,
/turf/open/floor/plating/beach/water,
/area/ruin/powered/beach)
"cx" = (
/obj/machinery/light,
/turf/open/floor/plating/beach/water,
/area/ruin/powered/beach)
"cy" = (
/obj/machinery/light,
/turf/open/floor/plating/beach/water,
/area/ruin/powered/beach)
(1,1,1) = {"
aa
@@ -646,11 +842,11 @@ ab
ab
ab
bn
br
cm
bu
bv
bu
bs
co
bC
ab
ab
@@ -673,7 +869,7 @@ ab
ab
ab
ap
ar
cg
ar
ar
ab
@@ -721,7 +917,7 @@ ap
bR
bT
bU
bU
ct
ab
ab
aa
@@ -740,7 +936,7 @@ aO
ar
bb
ar
ar
ci
ar
ar
aA
@@ -748,7 +944,7 @@ aA
aA
ar
ar
ar
cr
bN
bR
bT
@@ -819,7 +1015,7 @@ bT
bU
bU
bU
bU
cv
ab
ab
aa
@@ -859,10 +1055,10 @@ aa
(9,1,1) = {"
aa
ab
ab
ab
ab
aA
bW
bW
bW
ce
aA
aA
aA
@@ -893,7 +1089,7 @@ aa
ac
ae
as
ab
bW
aB
aK
aK
@@ -980,7 +1176,7 @@ bU
bU
bU
bU
bU
cx
ab
aa
"}
@@ -1051,7 +1247,7 @@ aa
(15,1,1) = {"
aa
ac
aj
cd
aj
aj
aF
@@ -1092,7 +1288,7 @@ aj
aj
bc
aj
aB
cj
aK
aA
ar
@@ -1172,7 +1368,7 @@ bU
bU
bU
bU
bU
cy
ab
aa
"}
@@ -1188,14 +1384,14 @@ aj
aj
aj
aj
aB
ck
aK
aA
ar
ar
ar
ar
ar
cq
ar
ar
bR
@@ -1275,10 +1471,10 @@ aa
(22,1,1) = {"
aa
ab
ab
ab
ab
aA
bW
bW
bW
cf
aA
aA
aA
@@ -1363,7 +1559,7 @@ bT
bU
bU
bU
bU
cw
ab
ab
aa
@@ -1412,7 +1608,7 @@ aq
ar
be
ar
ar
cl
ar
ar
aA
@@ -1420,7 +1616,7 @@ aA
aA
ar
ar
aU
cs
ar
bR
bT
@@ -1457,7 +1653,7 @@ ap
bR
bT
bU
bU
cu
ab
ab
aa
@@ -1473,7 +1669,7 @@ ab
ab
ab
ap
ar
ch
ap
ar
ab
@@ -1510,11 +1706,11 @@ ab
ab
ab
bo
bs
cn
bu
bu
bv
br
cp
bC
ab
ab
_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
+761 -179
View File
File diff suppressed because it is too large Load Diff
_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
+290 -116
View File
File diff suppressed because it is too large Load Diff
_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
+253 -51
View File
@@ -6,7 +6,7 @@
/turf/closed/wall/r_wall{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"ac" = (
/obj/item/stack/medical/ointment,
/obj/structure/table,
@@ -19,6 +19,9 @@
/obj/structure/table,
/obj/item/stack/medical/gauze,
/obj/item/stack/medical/gauze,
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
@@ -36,6 +39,9 @@
/area/ruin/powered/snow_biodome)
"ag" = (
/obj/structure/reagent_dispensers/beerkeg,
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
@@ -54,6 +60,9 @@
/area/ruin/powered/snow_biodome)
"aj" = (
/obj/structure/sink,
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
@@ -290,89 +299,92 @@
/obj/item/clothing/shoes/winterboots,
/obj/item/clothing/gloves/fingerless,
/turf/open/floor/pod/dark,
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"aT" = (
/obj/structure/grille,
/obj/structure/window/fulltile,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"aU" = (
/obj/machinery/vending/coffee,
/turf/open/floor/pod/dark,
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"aV" = (
/obj/structure/closet/secure_closet/freezer/fridge,
/turf/open/floor/pod/dark,
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"aW" = (
/turf/open/floor/pod/dark,
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"aX" = (
/turf/open/floor/pod/light,
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"aY" = (
/obj/structure/chair/stool,
/turf/open/floor/pod/dark,
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"aZ" = (
/obj/machinery/door/airlock/hatch,
/obj/structure/fans/tiny,
/turf/open/floor/pod/dark,
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"ba" = (
/obj/machinery/door/airlock/silver,
/obj/structure/fans/tiny,
/turf/open/floor/pod/dark,
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"bb" = (
/obj/machinery/door/airlock/silver,
/obj/structure/fans/tiny,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"bc" = (
/obj/structure/table,
/turf/open/floor/pod/dark,
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"bd" = (
/obj/structure/table,
/obj/item/weapon/pen,
/obj/item/weapon/paper_bin,
/turf/open/floor/pod/dark,
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"be" = (
/obj/structure/table,
/obj/machinery/microwave,
/turf/open/floor/pod/dark,
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"bf" = (
/obj/effect/decal/cleanable/oil,
/turf/open/floor/pod/dark,
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"bg" = (
/obj/item/weapon/twohanded/required/chainsaw,
/obj/structure/closet,
/obj/machinery/light/small{
dir = 4
},
/turf/open/floor/pod/dark,
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"bh" = (
/obj/structure/filingcabinet,
/turf/open/floor/pod/dark,
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"bi" = (
/obj/machinery/computer/monitor,
/turf/open/floor/pod/dark,
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"bj" = (
/obj/item/weapon/storage/toolbox/mechanical,
/turf/open/floor/pod/dark,
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"bk" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/pod/dark,
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"bl" = (
/turf/open/floor/wood{
baseturf = /turf/open/floor/plating/lava/smooth;
@@ -382,22 +394,22 @@
/area/ruin/powered/snow_biodome)
"bm" = (
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"bn" = (
/obj/item/clothing/mask/balaclava,
/turf/open/floor/pod/dark,
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"bo" = (
/obj/structure/table,
/obj/item/weapon/storage/fancy/cigarettes/cigpack_carp,
/turf/open/floor/pod/dark,
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"bp" = (
/obj/structure/table,
/obj/item/weapon/pen,
/obj/item/weapon/paper,
/turf/open/floor/pod/dark,
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"bq" = (
/obj/machinery/light/built{
dir = 1
@@ -406,12 +418,202 @@
baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/powered/snow_biodome)
/area/ruin/powered)
"br" = (
/obj/structure/fans/tiny,
/obj/machinery/door/airlock/glass_large,
/turf/open/floor/pod/dark,
/area/ruin/powered)
"bs" = (
/obj/machinery/door/airlock/glass_large,
/obj/structure/fans/tiny,
/turf/open/floor/pod/dark,
/area/ruin/powered)
"bt" = (
/obj/structure/fans/tiny,
/turf/open/floor/pod/dark,
/area/ruin/powered)
"bu" = (
/obj/structure/fans/tiny,
/turf/open/floor/pod/dark,
/area/ruin/powered)
"bv" = (
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plating/ice{
initial_gas_mix = "o2=22;n2=82;TEMP=180"
},
/area/ruin/powered/snow_biodome)
"bw" = (
/obj/machinery/light/small{
brightness = 3;
dir = 8
},
/turf/open/floor/wood{
baseturf = /turf/open/floor/plating/lava/smooth;
name = "floor"
},
/area/ruin/powered/snow_biodome)
"bx" = (
/obj/machinery/light{
dir = 4
},
/turf/open/floor/wood{
baseturf = /turf/open/floor/plating/lava/smooth;
name = "floor"
},
/area/ruin/powered/snow_biodome)
"by" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plating/asteroid/snow{
baseturf = /turf/open/floor/plating/lava/smooth;
initial_gas_mix = "o2=22;n2=82;TEMP=180"
},
/area/ruin/powered/snow_biodome)
"bz" = (
/obj/machinery/light,
/turf/open/floor/wood{
baseturf = /turf/open/floor/plating/lava/smooth;
name = "floor"
},
/area/ruin/powered/snow_biodome)
"bA" = (
/obj/machinery/light,
/turf/open/floor/wood{
baseturf = /turf/open/floor/plating/lava/smooth;
name = "floor"
},
/area/ruin/powered/snow_biodome)
"bB" = (
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plating/asteroid/snow{
baseturf = /turf/open/floor/plating/lava/smooth;
initial_gas_mix = "o2=22;n2=82;TEMP=180"
},
/area/ruin/powered/snow_biodome)
"bC" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plating/asteroid/snow{
baseturf = /turf/open/floor/plating/lava/smooth;
initial_gas_mix = "o2=22;n2=82;TEMP=180"
},
/area/ruin/powered/snow_biodome)
"bD" = (
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plating/asteroid/snow{
baseturf = /turf/open/floor/plating/lava/smooth;
initial_gas_mix = "o2=22;n2=82;TEMP=180"
},
/area/ruin/powered/snow_biodome)
"bE" = (
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plating/asteroid/snow{
baseturf = /turf/open/floor/plating/lava/smooth;
initial_gas_mix = "o2=22;n2=82;TEMP=180"
},
/area/ruin/powered/snow_biodome)
"bF" = (
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plating/asteroid/snow{
baseturf = /turf/open/floor/plating/lava/smooth;
initial_gas_mix = "o2=22;n2=82;TEMP=180"
},
/area/ruin/powered/snow_biodome)
"bG" = (
/obj/machinery/light/small{
brightness = 3;
dir = 8
},
/turf/open/floor/pod/dark,
/area/ruin/powered)
"bH" = (
/obj/machinery/light/small{
dir = 4
},
/turf/open/floor/pod/dark,
/area/ruin/powered)
"bI" = (
/obj/machinery/light/small{
brightness = 3;
dir = 8
},
/turf/open/floor/pod/dark,
/area/ruin/powered)
"bJ" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plating/asteroid/snow{
baseturf = /turf/open/floor/plating/lava/smooth;
initial_gas_mix = "o2=22;n2=82;TEMP=180"
},
/area/ruin/powered/snow_biodome)
"bK" = (
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plating/asteroid/snow{
baseturf = /turf/open/floor/plating/lava/smooth;
initial_gas_mix = "o2=22;n2=82;TEMP=180"
},
/area/ruin/powered/snow_biodome)
"bL" = (
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plating/asteroid/snow{
baseturf = /turf/open/floor/plating/lava/smooth;
initial_gas_mix = "o2=22;n2=82;TEMP=180"
},
/area/ruin/powered/snow_biodome)
"bM" = (
/obj/machinery/light,
/turf/open/floor/plating/asteroid/snow{
baseturf = /turf/open/floor/plating/lava/smooth;
initial_gas_mix = "o2=22;n2=82;TEMP=180"
},
/area/ruin/powered/snow_biodome)
"bN" = (
/obj/machinery/light,
/turf/open/floor/plating/ice{
initial_gas_mix = "o2=22;n2=82;TEMP=180"
},
/area/ruin/powered/snow_biodome)
"bO" = (
/obj/machinery/light,
/turf/open/floor/plating/asteroid/snow{
baseturf = /turf/open/floor/plating/lava/smooth;
initial_gas_mix = "o2=22;n2=82;TEMP=180"
},
/area/ruin/powered/snow_biodome)
"bP" = (
/obj/machinery/light,
/turf/open/floor/plating/asteroid/snow{
baseturf = /turf/open/floor/plating/lava/smooth;
initial_gas_mix = "o2=22;n2=82;TEMP=180"
},
/area/ruin/powered/snow_biodome)
"bQ" = (
/obj/machinery/light/small,
/turf/open/floor/pod/dark,
/area/ruin/powered)
"bR" = (
/obj/machinery/light/small,
/turf/open/floor/pod/dark,
/area/ruin/powered)
(1,1,1) = {"
aa
@@ -458,10 +660,10 @@ ab
ab
ab
aS
aW
bG
aW
aX
aW
bI
aW
bh
ab
@@ -486,7 +688,7 @@ ab
ab
ab
ak
ak
by
ak
ab
aS
@@ -552,7 +754,7 @@ ak
aI
ak
ak
ak
bC
az
ak
aB
@@ -560,7 +762,7 @@ ak
ak
ak
aI
ak
bJ
ak
ak
ak
@@ -577,7 +779,7 @@ aa
aa
aa
ab
ao
bv
ao
ao
ao
@@ -631,7 +833,7 @@ ak
ak
ak
ak
ak
bO
ab
ab
bm
@@ -744,7 +946,7 @@ aq
aq
aK
aq
ak
bD
ao
ao
ao
@@ -770,7 +972,7 @@ ab
ad
af
ar
at
bw
at
aD
at
@@ -790,7 +992,7 @@ ak
ak
ak
az
ak
bM
ab
aS
aS
@@ -806,7 +1008,7 @@ au
au
aq
at
at
bz
aq
ak
ak
@@ -825,7 +1027,7 @@ ak
aI
ab
bn
aW
bQ
ab
bm
"}
@@ -887,7 +1089,7 @@ ao
ak
ak
ak
aO
bs
aX
aX
br
@@ -919,10 +1121,10 @@ ao
ao
ak
ak
aP
bt
aX
aX
aP
bt
bm
"}
(17,1,1) = {"
@@ -966,7 +1168,7 @@ av
at
aG
at
at
bA
aq
aR
ak
@@ -985,7 +1187,7 @@ ao
ao
ab
aW
aW
bR
ab
bm
"}
@@ -995,7 +1197,7 @@ ai
af
aq
av
at
bx
aH
at
aN
@@ -1014,7 +1216,7 @@ ak
ak
ak
ao
ao
bN
ab
bo
bp
@@ -1032,7 +1234,7 @@ aq
aq
aq
aq
ak
bE
ak
ak
ak
@@ -1175,7 +1377,7 @@ ak
aI
aI
ak
ak
bP
ab
ab
bm
@@ -1224,7 +1426,7 @@ az
ak
ak
ak
ak
bF
ak
ak
ak
@@ -1232,7 +1434,7 @@ ak
ak
az
ak
ak
bK
ak
ak
az
@@ -1286,7 +1488,7 @@ ab
ab
ab
ak
ak
bB
ak
ab
aU
@@ -1298,7 +1500,7 @@ bf
bj
ab
ak
ak
bL
ak
ab
ab
@@ -1322,7 +1524,7 @@ ab
ab
ab
aV
aW
bH
aY
bc
be
_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm
+98 -22
View File
@@ -15,36 +15,36 @@
/area/ruin/powered)
"e" = (
/turf/open/floor/plating/lava/smooth,
/area/ruin/powered)
/area/ruin/powered/gluttony)
"f" = (
/obj/item/weapon/reagent_containers/syringe/gluttony,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/gluttony)
"g" = (
/obj/effect/gluttony,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/gluttony)
"h" = (
/obj/item/weapon/veilrender/vealrender,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/gluttony)
"i" = (
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/gluttony)
"j" = (
/obj/item/trash/plate,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/gluttony)
"k" = (
/obj/machinery/door/airlock/uranium,
/obj/structure/fans/tiny/invisible,
@@ -57,37 +57,113 @@
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/gluttony)
"m" = (
/obj/item/trash/raisins,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/gluttony)
"n" = (
/obj/item/trash/pistachios,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/gluttony)
"o" = (
/obj/item/trash/popcorn,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/gluttony)
"p" = (
/obj/item/trash/semki,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/gluttony)
"q" = (
/obj/item/trash/syndi_cakes,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/gluttony)
"r" = (
/obj/effect/gluttony,
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/gluttony)
"s" = (
/obj/effect/gluttony,
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/gluttony)
"t" = (
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/gluttony)
"u" = (
/obj/effect/gluttony,
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/gluttony)
"v" = (
/obj/machinery/light/small,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/gluttony)
"w" = (
/obj/machinery/light/small,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/gluttony)
"x" = (
/obj/machinery/light/small,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/gluttony)
"y" = (
/obj/machinery/light/small,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/gluttony)
"z" = (
/obj/item/trash/plate,
/obj/machinery/light/small{
dir = 8
},
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/gluttony)
"A" = (
/obj/machinery/light/small{
dir = 4
},
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/gluttony)
(1,1,1) = {"
a
@@ -211,7 +287,7 @@ c
d
i
i
i
v
d
c
b
@@ -253,7 +329,7 @@ c
c
c
d
i
t
i
m
d
@@ -277,7 +353,7 @@ d
d
g
m
i
w
d
d
d
@@ -294,7 +370,7 @@ c
d
e
d
g
r
g
g
g
@@ -302,7 +378,7 @@ g
i
p
i
j
z
l
i
d
@@ -338,7 +414,7 @@ c
d
e
d
g
s
g
g
g
@@ -346,7 +422,7 @@ i
g
i
l
i
A
i
q
d
@@ -365,7 +441,7 @@ d
d
g
i
i
x
d
d
d
@@ -385,7 +461,7 @@ c
c
c
d
g
u
i
i
d
@@ -431,7 +507,7 @@ c
d
j
i
i
y
d
c
b
_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
+136 -16
View File
@@ -122,6 +122,9 @@
name = "shrine of the liberator";
pixel_x = 0
},
/obj/machinery/light{
dir = 8
},
/turf/open/floor/mineral/titanium/purple{
baseturf = /turf/open/floor/plating/lava/smooth
},
@@ -215,6 +218,7 @@
/obj/item/weapon/storage/firstaid/fire,
/obj/structure/table/wood,
/obj/item/weapon/storage/firstaid/fire,
/obj/machinery/light,
/turf/open/floor/mineral/titanium/purple{
baseturf = /turf/open/floor/plating/lava/smooth
},
@@ -262,6 +266,122 @@
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/golem_ship)
"I" = (
/obj/machinery/light/small,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/golem_ship)
"J" = (
/obj/machinery/light/small,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/golem_ship)
"K" = (
/obj/machinery/light/small,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/golem_ship)
"L" = (
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/mineral/titanium/purple{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/golem_ship)
"M" = (
/obj/effect/mob_spawn/human/golem/adamantine,
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/mineral/titanium/purple{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/golem_ship)
"N" = (
/obj/machinery/light{
dir = 1
},
/turf/open/floor/mineral/titanium/purple{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/golem_ship)
"O" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/mineral/titanium/purple{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/golem_ship)
"P" = (
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/mineral/titanium/purple{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/golem_ship)
"Q" = (
/obj/machinery/light/small,
/turf/open/floor/mineral/titanium/purple{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/golem_ship)
"R" = (
/obj/machinery/light/small,
/turf/open/floor/mineral/titanium/purple{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/golem_ship)
"S" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/mineral/titanium/purple{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/golem_ship)
"T" = (
/obj/machinery/light/small,
/turf/open/floor/mineral/titanium/purple{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/golem_ship)
"U" = (
/obj/effect/mob_spawn/human/golem/adamantine,
/obj/machinery/light/small,
/turf/open/floor/mineral/titanium/purple{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/golem_ship)
"V" = (
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/golem_ship)
"W" = (
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/golem_ship)
"X" = (
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/golem_ship)
(1,1,1) = {"
a
@@ -358,7 +478,7 @@ a
a
a
b
l
L
l
j
l
@@ -384,10 +504,10 @@ l
l
b
l
l
Q
G
l
l
T
b
b
b
@@ -427,7 +547,7 @@ j
l
l
b
l
P
l
G
l
@@ -444,18 +564,18 @@ a
a
b
c
f
I
b
m
M
o
b
l
l
G
o
m
U
b
f
V
F
b
a
@@ -510,18 +630,18 @@ a
a
b
c
f
J
b
l
l
O
l
l
l
l
S
l
z
b
f
W
F
b
a
@@ -598,9 +718,9 @@ a
a
b
e
f
K
b
l
N
l
l
l
@@ -609,7 +729,7 @@ v
l
B
b
f
X
f
b
a
@@ -670,7 +790,7 @@ h
h
b
t
l
R
b
h
h
_maps/RandomRuins/LavaRuins/lavaland_surface_greed.dmm
+55 -19
View File
@@ -16,26 +16,32 @@
"e" = (
/obj/structure/table/wood/poker,
/obj/item/weapon/gun/ballistic/revolver/russian/soul,
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/carpet{
baseturf = /turf/open/floor/plating/lava/smooth;
icon_state = "carpetsymbol"
},
/area/ruin/powered)
/area/ruin/powered/greed)
"f" = (
/obj/structure/cursed_slot_machine,
/turf/open/floor/carpet{
baseturf = /turf/open/floor/plating/lava/smooth;
icon_state = "carpetsymbol"
},
/area/ruin/powered)
/area/ruin/powered/greed)
"g" = (
/obj/structure/table/wood/poker,
/obj/item/weapon/coin/mythril,
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/carpet{
baseturf = /turf/open/floor/plating/lava/smooth;
icon_state = "carpetsymbol"
},
/area/ruin/powered)
/area/ruin/powered/greed)
"h" = (
/obj/structure/table/wood/poker,
/obj/item/weapon/coin/diamond,
@@ -43,13 +49,13 @@
baseturf = /turf/open/floor/plating/lava/smooth;
icon_state = "carpetsymbol"
},
/area/ruin/powered)
/area/ruin/powered/greed)
"i" = (
/turf/open/floor/carpet{
baseturf = /turf/open/floor/plating/lava/smooth;
icon_state = "carpetsymbol"
},
/area/ruin/powered)
/area/ruin/powered/greed)
"j" = (
/obj/structure/table/wood/poker,
/obj/item/weapon/coin/adamantine,
@@ -57,7 +63,7 @@
baseturf = /turf/open/floor/plating/lava/smooth;
icon_state = "carpetsymbol"
},
/area/ruin/powered)
/area/ruin/powered/greed)
"k" = (
/obj/machinery/computer/arcade/battle{
emagged = 1
@@ -65,46 +71,50 @@
/turf/open/floor/engine/cult{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/greed)
"l" = (
/obj/item/weapon/coin/gold,
/turf/open/floor/engine/cult{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/greed)
"m" = (
/turf/open/floor/engine/cult{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/greed)
"n" = (
/obj/structure/table/wood/poker,
/obj/item/stack/spacecash/c1000,
/turf/open/floor/engine/cult{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/greed)
"o" = (
/obj/item/weapon/storage/bag/money,
/turf/open/floor/engine/cult{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/greed)
"p" = (
/obj/structure/table/wood/poker,
/obj/item/weapon/ore/gold,
/turf/open/floor/engine/cult{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/greed)
"q" = (
/obj/structure/table/wood/poker,
/obj/item/stack/spacecash/c20,
/obj/item/stack/spacecash/c50,
/obj/machinery/light/small{
brightness = 3;
dir = 8
},
/turf/open/floor/engine/cult{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/greed)
"r" = (
/obj/structure/table/wood/poker,
/obj/item/stack/spacecash/c500,
@@ -113,21 +123,47 @@
/turf/open/floor/engine/cult{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/greed)
"s" = (
/obj/structure/table/wood/poker,
/obj/item/stack/spacecash/c200,
/turf/open/floor/engine/cult{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/greed)
"t" = (
/obj/machinery/door/airlock/gold,
/obj/structure/fans/tiny/invisible,
/turf/open/floor/engine/cult{
baseturf = /turf/open/floor/plating/lava/smooth
},
/obj/structure/fans/tiny/invisible,
/area/ruin/powered)
"u" = (
/obj/structure/table/wood/poker,
/obj/item/stack/spacecash/c500,
/obj/item/stack/spacecash/c100,
/obj/item/stack/spacecash/c1000,
/obj/machinery/light/small{
dir = 4
},
/turf/open/floor/engine/cult{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/greed)
"v" = (
/obj/item/weapon/coin/gold,
/obj/machinery/light/small,
/turf/open/floor/engine/cult{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/greed)
"w" = (
/obj/item/weapon/storage/bag/money,
/obj/machinery/light/small,
/turf/open/floor/engine/cult{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/greed)
(1,1,1) = {"
a
@@ -320,7 +356,7 @@ m
m
l
m
l
v
d
d
a
@@ -364,7 +400,7 @@ m
l
m
l
o
w
d
d
a
@@ -404,7 +440,7 @@ c
d
d
p
r
u
r
d
c
_maps/RandomRuins/LavaRuins/lavaland_surface_pride.dmm
+116 -13
View File
@@ -20,7 +20,7 @@
/turf/open/floor/mineral/silver{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/pride)
"f" = (
/obj/structure/mirror{
pixel_x = 32
@@ -28,12 +28,12 @@
/turf/open/floor/mineral/silver{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/pride)
"g" = (
/turf/open/floor/mineral/silver{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/pride)
"h" = (
/obj/structure/mirror/magic/pride,
/turf/closed/wall/mineral/diamond{
@@ -47,6 +47,109 @@
blocks_air = 1
},
/area/ruin/powered)
"j" = (
/obj/structure/mirror{
pixel_x = -32
},
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/mineral/silver{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/pride)
"k" = (
/obj/structure/mirror{
pixel_x = 32
},
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/mineral/silver{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/pride)
"l" = (
/obj/structure/mirror{
pixel_x = -32
},
/obj/machinery/light/small{
brightness = 3;
dir = 8
},
/turf/open/floor/mineral/silver{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/pride)
"m" = (
/obj/structure/mirror{
pixel_x = 32
},
/obj/machinery/light/small{
dir = 4
},
/turf/open/floor/mineral/silver{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/pride)
"n" = (
/obj/structure/mirror{
pixel_x = -32
},
/obj/machinery/light/small{
brightness = 3;
dir = 8
},
/turf/open/floor/mineral/silver{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/pride)
"o" = (
/obj/structure/mirror{
pixel_x = 32
},
/obj/machinery/light/small{
dir = 4
},
/turf/open/floor/mineral/silver{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/pride)
"p" = (
/obj/structure/mirror{
pixel_x = -32
},
/obj/machinery/light/small{
brightness = 3;
dir = 8
},
/turf/open/floor/mineral/silver{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/pride)
"q" = (
/obj/structure/mirror{
pixel_x = 32
},
/obj/machinery/light/small{
dir = 4
},
/turf/open/floor/mineral/silver{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/pride)
"r" = (
/obj/machinery/light/small,
/turf/open/floor/mineral/silver{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/pride)
"s" = (
/obj/machinery/light/small,
/turf/open/floor/mineral/silver{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/pride)
(1,1,1) = {"
a
@@ -120,16 +223,16 @@ c
d
d
d
j
e
e
l
e
e
n
e
e
e
e
e
e
p
e
e
d
@@ -153,7 +256,7 @@ g
g
g
g
g
r
d
a
a
@@ -197,7 +300,7 @@ g
g
g
g
g
s
d
c
a
@@ -208,16 +311,16 @@ c
d
d
d
k
f
f
m
f
f
o
f
f
f
f
f
f
q
f
f
d
_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm
+84
View File
@@ -0,0 +1,84 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/lavaland/surface/outdoors)
"b" = (
/turf/closed/mineral/volcanic,
/area/lavaland/surface/outdoors)
"c" = (
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"d" = (
/obj/mecha/working/ripley/mining,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"e" = (
/obj/item/clothing/shoes/workboots/mining,
/obj/item/clothing/under/rank/miner/lavaland,
/obj/effect/decal/remains/human,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
(1,1,1) = {"
a
a
a
a
a
a
a
"}
(2,1,1) = {"
a
a
b
b
b
a
a
"}
(3,1,1) = {"
a
b
c
b
c
b
a
"}
(4,1,1) = {"
a
b
c
d
e
b
a
"}
(5,1,1) = {"
a
b
c
c
b
b
a
"}
(6,1,1) = {"
a
b
b
b
b
a
a
"}
(7,1,1) = {"
a
a
a
a
a
a
a
"}
_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
+138 -42
View File
@@ -19,31 +19,31 @@
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"e" = (
/obj/structure/table/wood,
/obj/item/weapon/storage/box/disks_plantgene,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"f" = (
/obj/machinery/plantgenes/seedvault,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"g" = (
/obj/structure/table/wood,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"h" = (
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"i" = (
/obj/structure/closet/crate/hydroponics,
/obj/structure/beebox,
@@ -57,7 +57,7 @@
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"j" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion";
@@ -71,13 +71,13 @@
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"l" = (
/obj/machinery/door/airlock,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"m" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion";
@@ -90,7 +90,7 @@
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"o" = (
/obj/structure/closet/crate/hydroponics,
/obj/item/weapon/cultivator,
@@ -108,13 +108,13 @@
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"p" = (
/obj/machinery/hydroponics/constructable,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"q" = (
/obj/item/weapon/hatchet,
/obj/item/weapon/storage/bag/plants,
@@ -123,7 +123,7 @@
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"r" = (
/obj/structure/table/wood,
/obj/item/weapon/storage/bag/plants,
@@ -133,7 +133,7 @@
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"s" = (
/obj/structure/table/wood,
/obj/item/weapon/gun/energy/floragun,
@@ -144,13 +144,13 @@
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"t" = (
/obj/effect/mob_spawn/human/seed_vault,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"u" = (
/obj/structure/sink{
icon_state = "sink";
@@ -161,19 +161,19 @@
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"v" = (
/obj/machinery/vending/hydronutrients,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"w" = (
/obj/machinery/vending/hydroseeds,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"x" = (
/obj/machinery/reagentgrinder{
pixel_y = 5
@@ -186,7 +186,7 @@
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"y" = (
/obj/structure/sink{
dir = 4;
@@ -197,13 +197,13 @@
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"z" = (
/obj/machinery/door/airlock/external,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"A" = (
/obj/machinery/door/airlock/external,
/obj/structure/fans/tiny,
@@ -217,31 +217,31 @@
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"C" = (
/obj/machinery/seed_extractor,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"D" = (
/obj/machinery/biogenerator,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"E" = (
/obj/machinery/chem_dispenser/mutagensaltpeter,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"F" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"G" = (
/obj/structure/closet/crate/hydroponics,
/obj/item/clothing/under/rank/hydroponics,
@@ -251,13 +251,13 @@
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"H" = (
/obj/machinery/chem_master/condimaster,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"I" = (
/obj/structure/table/wood,
/obj/item/weapon/reagent_containers/glass/bucket,
@@ -267,14 +267,14 @@
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"J" = (
/obj/item/weapon/storage/toolbox/syndicate,
/obj/structure/table/wood,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered)
/area/ruin/powered/seedvault)
"K" = (
/obj/structure/disposalpipe/segment,
/turf/closed/wall/r_wall,
@@ -292,6 +292,102 @@
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"N" = (
/obj/structure/table/wood,
/obj/item/weapon/storage/box/disks_plantgene,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/seedvault)
"O" = (
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/seedvault)
"P" = (
/obj/machinery/hydroponics/constructable,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/seedvault)
"Q" = (
/obj/machinery/hydroponics/constructable,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/seedvault)
"R" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/seedvault)
"S" = (
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/seedvault)
"T" = (
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/seedvault)
"U" = (
/obj/machinery/light,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/seedvault)
"V" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/seedvault)
"W" = (
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/seedvault)
"X" = (
/obj/machinery/hydroponics/constructable,
/obj/machinery/light,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/seedvault)
"Y" = (
/obj/machinery/hydroponics/constructable,
/obj/machinery/light,
/turf/open/floor/plasteel/freezer{
baseturf = /turf/open/floor/plating/lava/smooth
},
/area/ruin/powered/seedvault)
(1,1,1) = {"
a
@@ -346,10 +442,10 @@ a
a
c
c
T
h
h
h
h
U
c
c
a
@@ -389,12 +485,12 @@ c
k
c
n
h
R
u
h
h
u
h
V
u
c
a
@@ -429,17 +525,17 @@ a
a
a
c
e
N
h
c
p
P
h
p
h
h
p
h
p
X
c
a
a
@@ -539,17 +635,17 @@ a
b
a
c
h
O
h
c
p
Q
h
h
h
h
h
h
p
Y
c
a
a
@@ -587,12 +683,12 @@ c
i
c
s
h
S
y
h
h
y
h
W
J
c
a
_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+1311 -723
View File
File diff suppressed because it is too large Load Diff
_maps/RandomRuins/LavaRuins/lavaland_surface_ww_vault.dmm
-10010
View File
File diff suppressed because it is too large Load Diff
_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm
+42 -378
View File
@@ -8,185 +8,81 @@
},
/obj/structure/alien/resin/wall,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"c" = (
/obj/structure/alien/weeds{
icon_state = "weeds2"
},
/obj/structure/alien/resin/wall,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"d" = (
/obj/structure/alien/resin/wall,
/obj/structure/alien/weeds{
icon_state = "weeds2"
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"e" = (
/obj/structure/alien/weeds{
icon_state = "weeds1"
},
/obj/structure/alien/egg/burst,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"f" = (
/obj/structure/alien/weeds,
/obj/structure/alien/weeds{
icon_state = "weeds2"
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"g" = (
/obj/structure/alien/weeds,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"h" = (
/obj/structure/alien/weeds,
/obj/structure/alien/resin/wall,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"i" = (
/obj/structure/alien/weeds,
/obj/structure/bed/nest,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"j" = (
/obj/structure/alien/weeds{
icon_state = "weeds2"
},
/mob/living/simple_animal/hostile/alien,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"k" = (
/obj/structure/alien/weeds{
icon_state = "weeds2"
},
/obj/structure/alien/egg/burst,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"l" = (
/obj/structure/alien/weeds/node,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"m" = (
/obj/structure/alien/weeds{
icon_state = "weeds1"
},
/obj/structure/bed/nest,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"n" = (
/obj/structure/alien/weeds{
icon_state = "weeds2"
},
/obj/structure/bed/nest,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"o" = (
/obj/structure/alien/weeds,
/obj/structure/bed/nest,
@@ -198,43 +94,19 @@
},
/obj/item/weapon/gun/ballistic/automatic/pistol,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"p" = (
/obj/structure/alien/weeds{
icon_state = "weeds1"
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"q" = (
/obj/structure/alien/weeds{
icon_state = "weeds2"
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"r" = (
/obj/structure/alien/weeds{
icon_state = "weeds1"
@@ -242,112 +114,48 @@
/obj/structure/alien/resin/wall,
/obj/structure/alien/resin/wall,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"s" = (
/obj/structure/alien/weeds{
icon_state = "weeds2"
},
/obj/structure/alien/egg,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"t" = (
/obj/structure/alien/weeds{
icon_state = "weeds2"
},
/mob/living/simple_animal/hostile/alien/sentinel,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"u" = (
/obj/structure/alien/weeds{
icon_state = "weeds1"
},
/obj/effect/decal/cleanable/blood/gibs,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"v" = (
/obj/structure/alien/weeds/node,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"w" = (
/obj/structure/alien/weeds,
/obj/effect/decal/cleanable/blood/gibs,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"x" = (
/obj/structure/alien/weeds,
/obj/structure/alien/egg/burst,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"y" = (
/obj/structure/alien/weeds/node,
/obj/structure/alien/resin/wall,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"z" = (
/obj/structure/alien/weeds{
icon_state = "weeds1"
@@ -364,28 +172,12 @@
/obj/item/weapon/melee/baton/loaded,
/obj/item/clothing/head/helmet,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"A" = (
/obj/structure/alien/weeds,
/obj/structure/alien/egg,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"B" = (
/obj/structure/alien/weeds{
icon_state = "weeds1"
@@ -393,59 +185,27 @@
/obj/structure/alien/egg/burst,
/obj/effect/decal/cleanable/blood/gibs,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"C" = (
/obj/structure/alien/weeds,
/obj/structure/alien/egg/burst,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"D" = (
/obj/structure/alien/weeds{
icon_state = "weeds2"
},
/obj/effect/decal/cleanable/blood/gibs,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"E" = (
/obj/structure/alien/weeds,
/mob/living/simple_animal/hostile/alien/drone{
plants_off = 1
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"F" = (
/obj/structure/alien/weeds,
/mob/living/simple_animal/hostile/alien/queen/large{
@@ -455,15 +215,7 @@
plants_off = 1
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"G" = (
/obj/structure/alien/weeds{
icon_state = "weeds1"
@@ -472,28 +224,12 @@
plants_off = 1
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"H" = (
/obj/structure/alien/weeds,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"I" = (
/obj/structure/alien/weeds,
/obj/structure/bed/nest,
@@ -507,56 +243,24 @@
/obj/item/clothing/under/syndicate,
/obj/item/clothing/glasses/night,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"J" = (
/obj/structure/alien/weeds,
/mob/living/simple_animal/hostile/alien/sentinel,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"K" = (
/obj/structure/alien/weeds/node,
/mob/living/simple_animal/hostile/alien,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"L" = (
/obj/structure/alien/weeds/node,
/mob/living/simple_animal/hostile/alien/drone{
plants_off = 1
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"M" = (
/obj/structure/alien/weeds{
icon_state = "weeds1"
@@ -573,15 +277,7 @@
stat = 2
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"N" = (
/obj/structure/alien/weeds,
/obj/structure/alien/resin/wall,
@@ -590,15 +286,7 @@
"O" = (
/obj/structure/alien/weeds/node,
/turf/template_noop,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"P" = (
/obj/structure/alien/weeds{
icon_state = "weeds2"
@@ -615,41 +303,17 @@
plants_off = 1
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"R" = (
/obj/structure/alien/weeds,
/turf/template_noop,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"S" = (
/obj/structure/alien/weeds{
icon_state = "weeds2"
},
/turf/template_noop,
/area/awaycontent/a5{
always_unpowered = 1;
has_gravity = 1;
name = "The Hive";
power_environ = 0;
power_equip = 0;
power_light = 0;
poweralm = 0
})
/area/ruin/xenonest)
"T" = (
/obj/structure/alien/weeds/node,
/obj/structure/alien/resin/wall,
_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
+1 -1
View File
@@ -475,7 +475,7 @@
/area/ruin/derelictoutpost)
"bq" = (
/obj/effect/mob_spawn/human/corpse/nanotrasensoldier{
helmet = null;
head = null;
id_job = "Tradepost Officer";
name = "Tradeport Officer";
random = 1
_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+418 -6738
View File
File diff suppressed because it is too large Load Diff
_maps/RandomRuins/SpaceRuins/dragoontomb.dmm
-1888
View File
File diff suppressed because it is too large Load Diff
_maps/RandomRuins/SpaceRuins/oldstation.dmm
+9367
View File
File diff suppressed because it is too large Load Diff
_maps/RandomRuins/SpaceRuins/vaporwave.dmm
+42 -6
View File
@@ -37,6 +37,9 @@
/area/ruin/powered/aesthetic)
"j" = (
/obj/structure/chair/stool,
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plasteel/vaporwave,
/area/ruin/powered/aesthetic)
"k" = (
@@ -153,10 +156,10 @@
},
/area/ruin/unpowered/no_grav)
"G" = (
/obj/effect/turf_decal/stripes/asteroid/line,
/turf/open/floor/plating/astplate{
initial_gas_mix = "TEMP=2.7"
},
/obj/effect/turf_decal/stripes/asteroid/line,
/area/ruin/unpowered/no_grav)
"H" = (
/obj/effect/overlay/palmtree_l,
@@ -196,6 +199,39 @@
/obj/effect/decal/sandeffect,
/turf/open/floor/plasteel/airless/asteroid,
/area/ruin/unpowered/no_grav)
"O" = (
/obj/structure/chair/comfy/black{
dir = 8
},
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plasteel/vaporwave,
/area/ruin/powered/aesthetic)
"P" = (
/obj/machinery/light/small,
/turf/open/floor/plasteel/vaporwave,
/area/ruin/powered/aesthetic)
"Q" = (
/obj/machinery/light/small,
/turf/open/floor/plasteel/vaporwave,
/area/ruin/powered/aesthetic)
"R" = (
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plating/astplate{
initial_gas_mix = "TEMP=2.7"
},
/area/ruin/unpowered/no_grav)
"S" = (
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plating/astplate{
initial_gas_mix = "TEMP=2.7"
},
/area/ruin/unpowered/no_grav)
(1,1,1) = {"
a
@@ -294,7 +330,7 @@ h
u
y
f
B
R
d
d
a
@@ -326,7 +362,7 @@ j
k
k
v
k
P
f
C
I
@@ -390,11 +426,11 @@ a
d
c
g
n
O
n
k
w
k
Q
g
F
I
@@ -430,7 +466,7 @@ p
u
y
g
B
S
d
d
a
_maps/RandomZLevels/beach.dmm
+1 -1
View File
@@ -163,7 +163,7 @@
/area/awaymission/beach)
"aC" = (
/obj/effect/mob_spawn/human/cook{
helmet = null;
head = null;
id_access = "Bartender";
id_job = "Bartender";
suit = /obj/item/clothing/suit/armor/vest;
_maps/RandomZLevels/centcomAway.dmm
+2 -2
View File
@@ -3502,7 +3502,7 @@
/area/awaymission/centcomAway/general)
"kN" = (
/obj/structure/table/wood,
/obj/item/clothing/tie/medal,
/obj/item/clothing/accessory/medal,
/turf/open/floor/carpet,
/area/awaymission/centcomAway/general)
"kO" = (
@@ -3516,7 +3516,7 @@
/area/awaymission/centcomAway/general)
"kQ" = (
/obj/structure/table/wood,
/obj/item/clothing/tie/medal/gold,
/obj/item/clothing/accessory/medal/gold,
/turf/open/floor/carpet,
/area/awaymission/centcomAway/general)
"kR" = (
_maps/RandomZLevels/snowdin.dmm
+1 -1
View File
@@ -4740,7 +4740,7 @@
/area/awaymission/snowdin/sekret)
"mx" = (
/obj/structure/table/reinforced,
/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/smg,
/obj/item/weapon/storage/backpack/duffelbag/syndie/ammo/smg,
/turf/open/floor/plasteel{
baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
_maps/RandomZLevels/wildwest.dmm
+3 -3
View File
@@ -187,7 +187,7 @@
/turf/closed/mineral,
/area/awaymission/wwmines)
"aO" = (
/obj/effect/mob_spawn/human/syndicatecommando,
/obj/effect/mob_spawn/human/corpse/syndicatecommando,
/turf/open/floor/plasteel/cult{
name = "engraved floor";
tag = "icon-cult"
@@ -929,7 +929,7 @@
},
/area/awaymission/wwgov)
"dh" = (
/obj/effect/mob_spawn/human/syndicatecommando{
/obj/effect/mob_spawn/human/corpse/syndicatecommando{
mob_name = "Syndicate Commando"
},
/turf/open/floor/carpet,
@@ -2017,7 +2017,7 @@
},
/area/awaymission/wwmines)
"gy" = (
/obj/effect/mob_spawn/human/syndicatecommando{
/obj/effect/mob_spawn/human/corpse/syndicatecommando{
mob_name = "Syndicate Commando"
},
/turf/open/floor/grass,
_maps/__MAP_DEFINES.dm
-31
View File
@@ -1,31 +0,0 @@
/*
The /tg/ codebase currently requires you to have 11 z-levels of the same size dimensions.
z-level order is important, the order you put them in inside the map config.dm will determine what z level number they are assigned ingame.
Names of z-level do not matter, but order does greatly, for instances such as checking alive status of revheads on z1
current as of 2016/6/2
z1 = station
z2 = centcomm
z5 = mining
Everything else = randomized space
Last space-z level = empty
*/
#define CROSSLINKED 2
#define SELFLOOPING 1
#define UNAFFECTED 0
#define MAIN_STATION "Main Station"
#define CENTCOMM "CentComm"
#define EMPTY_AREA_1 "Empty Area 1"
#define EMPTY_AREA_2 "Empty Area 2"
#define MINING "Mining Asteroid"
#define EMPTY_AREA_3 "Empty Area 3"
#define EMPTY_AREA_4 "Empty Area 4"
#define EMPTY_AREA_5 "Empty Area 5"
#define EMPTY_AREA_6 "Empty Area 6"
#define EMPTY_AREA_7 "Empty Area 7"
#define EMPTY_AREA_8 "Empty Area 8"
#define AWAY_MISSION "Away Mission"
#define AWAY_MISSION_LIST list(AWAY_MISSION = SELFLOOPING)
#define DEFAULT_MAP_TRANSITION_CONFIG list(MAIN_STATION = CROSSLINKED, CENTCOMM = SELFLOOPING, EMPTY_AREA_1 = CROSSLINKED, EMPTY_AREA_2 = CROSSLINKED, MINING = SELFLOOPING, EMPTY_AREA_3 = CROSSLINKED, EMPTY_AREA_4 = CROSSLINKED, EMPTY_AREA_5 = CROSSLINKED, EMPTY_AREA_6 = CROSSLINKED, EMPTY_AREA_7 = CROSSLINKED, EMPTY_AREA_8 = CROSSLINKED)
_maps/basemap.dm
+27 -7
View File
@@ -1,7 +1,27 @@
#ifndef ALL_MAPS
#include "map_files\generic\SpaceStation.dmm"
#include "map_files\generic\Centcomm.dmm"
#include "map_files\generic\Space.dmm"
#include "map_files\generic\SpaceDock.dmm"
#include "map_files\Mining\lavaland.dmm"
#endif
#include "map_files\generic\Centcomm.dmm"
#include "map_files\generic\SpaceStation.dmm"
#include "map_files\generic\Space.dmm"
#include "map_files\generic\SpaceDock.dmm"
#include "map_files\Mining\Lavaland.dmm"
#ifdef ALL_MAPS
#include "map_files\debug\runtimestation.dmm"
#include "map_files\Deltastation\DeltaStation2.dmm"
#include "map_files\MetaStation\MetaStation.dmm"
#include "map_files\OmegaStation\OmegaStation.dmm"
#include "map_files\PubbyStation\PubbyStation.dmm"
#include "map_files\TgStation\tgstation.2.1.3.dmm"
#include "map_files\Cerestation\Cerestation.dmm"
#include "map_files\generic\Centcomm.dmm"
#include "map_files\generic\SpaceStation.dmm"
#include "map_files\generic\Space.dmm"
#include "map_files\generic\SpaceDock.dmm"
#include "map_files\Mining\Lavaland.dmm"
#ifdef TRAVISBUILDING
#include "templates.dm"
#endif
#endif
_maps/loadallmaps.dm
-21
View File
@@ -1,21 +0,0 @@
#ifdef ALL_MAPS
#include "map_files\debug\runtimestation.dmm"
#include "map_files\Deltastation\DeltaStation2.dmm"
#include "map_files\MetaStation\MetaStation.dmm"
#include "map_files\OmegaStation\OmegaStation.dmm"
#include "map_files\PubbyStation\PubbyStation.dmm"
#include "map_files\TgStation\tgstation.2.1.3.dmm"
#include "map_files\Cerestation\cerestation.dmm"
#include "map_files\CitadelStation\CitadelStation-1.2.1.dmm"
#include "map_files\generic\Centcomm.dmm"
#include "map_files\generic\SpaceStation.dmm"
#include "map_files\generic\Space.dmm"
#include "map_files\generic\SpaceDock.dmm"
#include "map_files\Mining\Lavaland.dmm"
#ifdef TRAVISBUILDING
#include "templates.dm"
#endif
#endif
_maps/map_files/Cerestation/cerestation.dmm
+40867 -43365
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/CitadelStation/CitadelStation-1.2.1.dmm
-7213
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/CitadelStation/CitadelStation-1.2.2.dmm
+128260
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/Deltastation/DeltaStation2.dmm
+10305 -15478
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/MetaStation/MetaStation.dmm
+8893 -12579
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/Mining/Lavaland.dmm
+59073 -59087
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/OmegaStation/OmegaStation.dmm
+1145 -2154
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/PubbyStation/PubbyStation.dmm
+2630 -4430
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/TgStation/tgstation.2.1.3.dmm
+7316 -128246
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/TgStation/tgstation.2.1.4.dmm
+131717
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/debug/runtimestation.dmm
+1417 -201
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/generic/Centcomm.dmm
+114 -94
View File
@@ -10,7 +10,6 @@
/turf/closed/indestructible/riveted,
/area/space)
"ad" = (
/obj/effect/landmark/transit,
/turf/open/space,
/area/space)
"ae" = (
@@ -2648,7 +2647,7 @@
/turf/open/floor/circuit,
/area/ctf)
"hq" = (
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"hr" = (
/obj/effect/turf_decal/stripes/line,
@@ -3700,7 +3699,7 @@
turf_type = /turf/open/floor/plating/asteroid/snow;
width = 50
},
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"jY" = (
/turf/open/floor/plasteel/brown{
@@ -4260,7 +4259,7 @@
/area/centcom/control)
"ln" = (
/obj/structure/flora/grass/both,
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"lo" = (
/obj/structure/table/reinforced,
@@ -4415,11 +4414,11 @@
/area/centcom/control)
"lF" = (
/obj/structure/flora/grass/brown,
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"lG" = (
/obj/structure/flora/tree/pine,
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"lH" = (
/turf/closed/indestructible/fakeglass{
@@ -4433,7 +4432,7 @@
set_cap = 1;
set_luminosity = 4
},
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"lJ" = (
/turf/closed/indestructible/riveted,
@@ -4636,7 +4635,7 @@
/area/syndicate_mothership/control)
"mh" = (
/obj/item/toy/figure/syndie,
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"mi" = (
/obj/machinery/newscaster/security_unit,
@@ -4769,7 +4768,7 @@
/area/centcom/control)
"mz" = (
/obj/structure/flora/bush,
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"mA" = (
/turf/closed/indestructible/fakeglass,
@@ -5590,8 +5589,8 @@
/obj/item/clothing/under/skirt/black,
/obj/item/clothing/under/shorts/black,
/obj/item/clothing/under/pants/track,
/obj/item/clothing/tie/armband/deputy,
/obj/item/clothing/tie/waistcoat,
/obj/item/clothing/accessory/armband/deputy,
/obj/item/clothing/accessory/waistcoat,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/neck/stripedredscarf,
@@ -5976,7 +5975,7 @@
},
/area/wizard_station)
"pk" = (
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/space)
"pl" = (
/obj/machinery/computer/shuttle/syndicate/recall,
@@ -6941,7 +6940,7 @@
/turf/open/floor/plating/airless,
/area/syndicate_mothership/control)
"rl" = (
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/obj/machinery/porta_turret/syndicate/pod,
/turf/closed/wall/mineral/plastitanium{
dir = 8;
@@ -6960,7 +6959,7 @@
/turf/open/floor/plating,
/area/shuttle/assault_pod)
"ro" = (
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/obj/machinery/porta_turret/syndicate/pod,
/turf/closed/wall/mineral/plastitanium{
dir = 1;
@@ -7776,7 +7775,7 @@
turf_type = /turf/open/floor/plating/asteroid/snow;
width = 18
},
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/space)
"th" = (
/obj/item/weapon/storage/box/drinkingglasses,
@@ -8097,7 +8096,7 @@
name = "\improper FOURTH WALL";
pixel_x = -32
},
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"tS" = (
/turf/open/floor/wood,
@@ -8332,14 +8331,14 @@
},
/area/syndicate_mothership/control)
"ux" = (
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/obj/machinery/porta_turret/syndicate/pod,
/turf/closed/wall/mineral/plastitanium{
icon_state = "diagonalWall3"
},
/area/shuttle/assault_pod)
"uy" = (
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/obj/machinery/porta_turret/syndicate/pod,
/turf/closed/wall/mineral/plastitanium{
dir = 4;
@@ -9745,7 +9744,7 @@
/area/centcom/evac)
"yc" = (
/obj/structure/statue/uranium/nuke,
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"yd" = (
/obj/structure/table/wood,
@@ -11175,7 +11174,7 @@
/obj/structure/rack,
/obj/item/clothing/head/that,
/obj/item/clothing/under/suit_jacket,
/obj/item/clothing/tie/waistcoat,
/obj/item/clothing/accessory/waistcoat,
/turf/open/floor/plasteel/cafeteria,
/area/centcom/holding)
"BI" = (
@@ -11379,7 +11378,7 @@
/obj/structure/sign/goldenplaque{
pixel_y = 32
},
/obj/item/clothing/tie/lawyers_badge{
/obj/item/clothing/accessory/lawyers_badge{
desc = "A badge of upmost glory.";
name = "thunderdome badge"
},
@@ -11400,7 +11399,7 @@
/obj/structure/sign/goldenplaque{
pixel_y = 32
},
/obj/item/clothing/tie/medal/silver{
/obj/item/clothing/accessory/medal/silver{
pixel_y = 5
},
/turf/open/floor/plasteel/grimy,
@@ -11605,11 +11604,11 @@
name = "Thunderdome Plaque";
pixel_y = -32
},
/obj/item/clothing/tie/medal/gold{
/obj/item/clothing/accessory/medal/gold{
pixel_x = 3;
pixel_y = 5
},
/obj/item/clothing/tie/medal/gold,
/obj/item/clothing/accessory/medal/gold,
/turf/open/floor/plasteel/grimy,
/area/tdome/tdomeobserve)
"CF" = (
@@ -11625,7 +11624,7 @@
name = "Thunderdome Plaque";
pixel_y = -32
},
/obj/item/clothing/tie/medal{
/obj/item/clothing/accessory/medal{
pixel_y = 5
},
/turf/open/floor/plasteel/grimy,
@@ -12212,7 +12211,7 @@
name = "Thunderdome Blast Door"
},
/turf/open/floor/plasteel/loadingarea{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface;
baseturf = /turf/open/space;
dir = 8
},
/area/tdome/arena)
@@ -12243,7 +12242,7 @@
name = "General Supply"
},
/turf/open/floor/plasteel/loadingarea{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface;
baseturf = /turf/open/space;
dir = 8
},
/area/tdome/arena)
@@ -12394,7 +12393,7 @@
/area/tdome/arena)
"Ey" = (
/turf/open/floor/plasteel/loadingarea{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface;
baseturf = /turf/open/space;
dir = 8
},
/area/tdome/arena)
@@ -13716,7 +13715,7 @@
/area/tdome/arena_source)
"IS" = (
/turf/open/floor/plasteel/loadingarea{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface;
baseturf = /turf/open/space;
dir = 8
},
/area/tdome/arena_source)
@@ -13765,7 +13764,7 @@
/area/tdome/arena_source)
"Jd" = (
/turf/open/floor/plasteel/loadingarea{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface;
baseturf = /turf/open/space;
dir = 8
},
/area/tdome/arena_source)
@@ -14078,7 +14077,7 @@
set_cap = 1;
set_luminosity = 4
},
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"Kh" = (
/obj/machinery/light{
@@ -14104,7 +14103,7 @@
set_cap = 1;
set_luminosity = 4
},
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"Kk" = (
/obj/structure/chair{
@@ -14123,7 +14122,7 @@
set_cap = 1;
set_luminosity = 4
},
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"Km" = (
/obj/effect/turf_decal/stripes/line,
@@ -14141,7 +14140,7 @@
set_cap = 1;
set_luminosity = 4
},
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"Kp" = (
/obj/structure/flora/ausbushes/lavendergrass,
@@ -14657,7 +14656,7 @@
set_cap = 1;
set_luminosity = 4
},
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"Lx" = (
/obj/structure/flora/grass/brown,
@@ -14665,7 +14664,7 @@
set_cap = 1;
set_luminosity = 4
},
/turf/open/floor/plating/asteroid/snow/atmosphere,
/turf/open/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
"Ly" = (
/obj/structure/flora/grass/brown,
@@ -14897,6 +14896,27 @@
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"Mg" = (
/obj/item/cardboard_cutout{
desc = "They seem to be ignoring you... Typical.";
dir = 1;
icon_state = "cutout_ntsec";
name = "Private Security Officer"
},
/turf/open/floor/plasteel/darkred/side{
dir = 1
},
/area/centcom/evac)
"Mh" = (
/obj/item/cardboard_cutout{
desc = "They seem to be ignoring you... Typical.";
icon_state = "cutout_ntsec";
name = "Private Security Officer"
},
/turf/open/floor/plasteel/vault{
dir = 5
},
/area/centcom/evac)
(1,1,1) = {"
aa
@@ -65195,7 +65215,7 @@ sv
wW
xt
xQ
xZ
Mg
yC
yC
yU
@@ -65454,7 +65474,7 @@ xp
xR
xZ
yC
yC
Mh
yV
qk
aa
@@ -71987,14 +72007,14 @@ fj
fy
fC
fN
fO
fO
fO
fO
fO
fO
fO
fO
ab
ab
ab
ab
ab
ab
ab
ab
aa
aa
aa
@@ -72244,14 +72264,14 @@ fi
fv
fC
fN
fO
ab
fR
fR
fR
fR
fR
fR
fO
ab
aa
aa
aa
@@ -72501,16 +72521,16 @@ ag
ag
ag
ab
fO
ab
fS
fS
fS
fS
fS
fS
fO
fO
fO
ab
ab
ab
aa
aa
aa
@@ -72758,7 +72778,7 @@ fk
dZ
fD
fN
fO
ab
ab
ab
ab
@@ -72767,7 +72787,7 @@ ab
ab
fZ
ga
fO
ab
aa
aa
aa
@@ -73015,7 +73035,7 @@ fk
dZ
fD
fN
fO
ab
ab
ab
ab
@@ -73024,7 +73044,7 @@ ab
ab
fZ
ga
fO
ab
aa
aa
aa
@@ -73272,7 +73292,7 @@ fl
dZ
fD
fN
fO
ab
ab
ab
ab
@@ -73281,7 +73301,7 @@ ab
ab
fZ
ga
fO
ab
aa
aa
aa
@@ -73529,7 +73549,7 @@ fk
dZ
fD
fN
fO
ab
ab
ab
ab
@@ -73538,7 +73558,7 @@ ab
ab
fZ
ga
fO
ab
aa
aa
aa
@@ -73786,7 +73806,7 @@ fk
dZ
fD
fN
fO
ab
ab
ab
ab
@@ -73795,7 +73815,7 @@ ab
ab
fZ
ga
fO
ab
aa
aa
aa
@@ -74043,16 +74063,16 @@ ag
ag
ag
ab
fO
ab
fT
fT
fT
fT
fT
fT
fO
fO
fO
ab
ab
ab
aa
aa
aa
@@ -78155,16 +78175,16 @@ fr
em
fI
fN
fO
ab
fT
fT
fT
fT
fT
fT
fO
fO
fO
ab
ab
ab
aa
aa
aa
@@ -78412,7 +78432,7 @@ en
en
fJ
fN
fO
ab
ab
ab
ab
@@ -78421,7 +78441,7 @@ ab
ab
fZ
gb
fO
ab
aa
aa
aa
@@ -78669,7 +78689,7 @@ ag
ag
ag
ab
fO
ab
ab
ab
ab
@@ -78678,7 +78698,7 @@ ab
ab
fZ
gb
fO
ab
aa
aa
aa
@@ -78926,7 +78946,7 @@ dP
dP
dP
fN
fO
ab
ab
ab
ab
@@ -78935,7 +78955,7 @@ ab
ab
fZ
gb
fO
ab
aa
aa
aa
@@ -79183,7 +79203,7 @@ fs
fB
fK
fN
fO
ab
ab
ab
ab
@@ -79192,7 +79212,7 @@ ab
ab
fZ
gb
fO
ab
aa
aa
aa
@@ -79440,7 +79460,7 @@ ft
fB
fL
fN
fO
ab
ab
ab
ab
@@ -79449,7 +79469,7 @@ ab
ab
fZ
gb
fO
ab
aa
aa
aa
@@ -79697,16 +79717,16 @@ fu
fB
fM
fN
fO
ab
fS
fS
fS
fS
fS
fS
fO
fO
fO
ab
ab
ab
aa
aa
aa
@@ -79954,14 +79974,14 @@ dT
dT
dT
fN
fO
ab
fW
fW
fW
fW
fW
fW
fO
ab
aa
aa
aa
@@ -80211,14 +80231,14 @@ ag
ag
ag
ab
fO
fO
fO
fO
fO
fO
fO
fO
ab
ab
ab
ab
ab
ab
ab
ab
aa
aa
aa
_maps/map_files/generic/Fastload.dmm
-3
View File
@@ -1,3 +0,0 @@
"a" = ()
(1,1,1, 1,1,1) = {""}
_maps/map_files/generic/Space.dmm
+65537 -256
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/generic/SpaceDock.dmm
+65549 -257
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/generic/SpaceStation.dmm
+65537 -256
View File
File diff suppressed because it is too large Load Diff
_maps/shuttles/emergency_raven.dmm
+179 -19
View File
@@ -123,6 +123,7 @@
},
/area/shuttle/escape)
"aw" = (
/obj/machinery/light,
/turf/open/floor/plasteel/darkblue/side,
/area/shuttle/escape)
"ax" = (
@@ -168,6 +169,10 @@
"aE" = (
/obj/structure/table/reinforced,
/obj/item/weapon/defibrillator/loaded,
/obj/machinery/light{
dir = 4;
icon_state = "tube1"
},
/turf/open/floor/plasteel/darkpurple/side{
dir = 4
},
@@ -216,6 +221,9 @@
id = "shuttleflash";
pixel_y = -23
},
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel/darkblue/side{
tag = "icon-darkblue (NORTH)";
dir = 1
@@ -232,6 +240,9 @@
},
/area/shuttle/escape)
"aM" = (
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel/darkblue/side{
tag = "icon-darkblue (NORTH)";
dir = 1
@@ -412,6 +423,9 @@
pixel_y = 9
},
/obj/structure/closet/crate/internals,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel/darkyellow/side{
tag = "icon-darkyellow (NORTHEAST)";
icon_state = "darkyellow";
@@ -516,6 +530,9 @@
pixel_y = 8
},
/obj/structure/table/reinforced,
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plasteel/darkpurple/side{
dir = 8
},
@@ -918,6 +935,9 @@
/area/shuttle/escape)
"ch" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plasteel/darkgreen/side{
dir = 9;
icon_state = "darkgreen";
@@ -926,6 +946,10 @@
/area/shuttle/escape)
"ci" = (
/obj/structure/reagent_dispensers/watertank,
/obj/machinery/light{
dir = 4;
icon_state = "tube1"
},
/turf/open/floor/plasteel/darkgreen/side{
dir = 5
},
@@ -1040,9 +1064,9 @@
name = "Bridge Blast Shutters";
pixel_x = 0;
pixel_y = -26;
req_access_txt = "150";
pixel_x = 0
req_access_txt = "19"
},
/obj/machinery/light,
/turf/open/floor/plasteel/darkblue/side,
/area/shuttle/escape)
"cA" = (
@@ -1482,10 +1506,146 @@
pixel_x = 24;
pixel_y = 0
},
/obj/machinery/light{
dir = 4;
icon_state = "tube1"
},
/turf/open/floor/plasteel/darkgreen/side{
dir = 4
},
/area/shuttle/escape)
"eC" = (
/obj/machinery/light{
dir = 4;
icon_state = "tube1"
},
/turf/open/floor/plasteel/darkpurple/side{
dir = 4
},
/area/shuttle/escape)
"eD" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig{
dir = 8;
floor_tile = /obj/item/stack/tile/plasteel;
icon_state = "darkred"
},
/area/shuttle/escape)
"eE" = (
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel/darkgreen/side{
tag = "icon-darkgreen (NORTH)";
icon_state = "darkgreen";
dir = 1
},
/area/shuttle/escape)
"eF" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plasteel/darkgreen/side{
dir = 8
},
/area/shuttle/escape)
"eG" = (
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel/darkgreen/side{
tag = "icon-darkgreen (NORTH)";
icon_state = "darkgreen";
dir = 1
},
/area/shuttle/escape)
"eH" = (
/obj/machinery/light,
/turf/open/floor/plasteel/darkgreen/side,
/area/shuttle/escape)
"eI" = (
/obj/machinery/light,
/turf/open/floor/plasteel/darkgreen/side,
/area/shuttle/escape)
"eJ" = (
/obj/machinery/button/flasher{
id = "cockpit_flasher";
pixel_x = 6;
pixel_y = -24
},
/obj/machinery/light,
/turf/open/floor/mineral/titanium/blue,
/area/space)
"eK" = (
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel/darkgreen/side{
tag = "icon-darkgreen (NORTH)";
icon_state = "darkgreen";
dir = 1
},
/area/shuttle/escape)
"eL" = (
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel/darkgreen/side{
tag = "icon-darkgreen (NORTH)";
icon_state = "darkgreen";
dir = 1
},
/area/shuttle/escape)
"eM" = (
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel/darkgreen/side{
tag = "icon-darkgreen (NORTH)";
icon_state = "darkgreen";
dir = 1
},
/area/shuttle/escape)
"eN" = (
/obj/machinery/light{
dir = 4;
icon_state = "tube1"
},
/turf/open/floor/plasteel/darkgreen/side{
dir = 4
},
/area/shuttle/escape)
"eO" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plasteel/darkgreen/side{
dir = 8
},
/area/shuttle/escape)
"eP" = (
/obj/machinery/light,
/turf/open/floor/plasteel/darkgreen/side,
/area/shuttle/escape)
"eQ" = (
/obj/machinery/light{
dir = 4;
icon_state = "tube1"
},
/turf/open/floor/plasteel/darkgreen/side{
dir = 4
},
/area/shuttle/escape)
"eR" = (
/obj/machinery/light,
/turf/open/floor/plasteel/darkgreen/side,
/area/shuttle/escape)
"eS" = (
/obj/machinery/light,
/turf/open/floor/plasteel/darkgreen/side,
/area/shuttle/escape)
(1,1,1) = {"
aa
@@ -1531,7 +1691,7 @@ cs
ar
aW
bc
bc
eD
bc
bc
bc
@@ -1545,7 +1705,7 @@ cu
bF
be
be
be
eO
be
be
cd
@@ -1604,19 +1764,19 @@ cu
cu
cs
ar
br
eG
aC
bz
eH
ar
bT
bo
br
eK
bZ
ca
aC
bZ
ca
bz
eR
ab
ch
ar
@@ -1636,7 +1796,7 @@ be
be
be
be
be
eF
be
bG
aC
@@ -1712,13 +1872,13 @@ bP
ar
bU
bo
br
eL
bZ
ca
aC
bZ
ca
bz
eS
ab
ci
ar
@@ -1742,7 +1902,7 @@ bz
cs
bH
bG
bz
eI
cs
cs
cs
@@ -1771,7 +1931,7 @@ bb
bf
bk
cs
br
eE
bz
cs
bI
@@ -1884,9 +2044,9 @@ aa
cs
cs
cs
br
eM
aC
bz
eP
cs
cs
cs
@@ -1946,7 +2106,7 @@ bB
cu
ad
ad
ad
eJ
ad
cu
br
@@ -2004,7 +2164,7 @@ ar
aE
aI
aO
aV
eC
aV
bi
bm
@@ -2020,9 +2180,9 @@ cs
bW
aZ
aZ
eN
aZ
aZ
aZ
eQ
aZ
aZ
ce
_maps/shuttles/whiteship_meta.dmm
+3 -3
View File
@@ -1747,10 +1747,10 @@
/area/shuttle/abandoned)
"db" = (
/obj/structure/table,
/obj/item/weapon/storage/backpack/dufflebag/med{
/obj/item/weapon/storage/backpack/duffelbag/med{
contents = newlist(/obj/item/weapon/scalpel,/obj/item/weapon/hemostat,/obj/item/weapon/retractor,/obj/item/weapon/cautery,/obj/item/weapon/circular_saw,/obj/item/weapon/surgicaldrill,/obj/item/weapon/razor);
desc = "A large dufflebag for holding extra medical supplies - this one seems to be designed for holding surgical tools.";
name = "surgical dufflebag";
desc = "A large duffelbag for holding extra medical supplies - this one seems to be designed for holding surgical tools.";
name = "surgical duffelbag";
pixel_y = 4
},
/turf/open/floor/mineral/titanium,
_maps/templates/shelter_2.dmm
+294
View File
@@ -0,0 +1,294 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/closed/wall/mineral/titanium/survival/pod,
/area/survivalpod)
"b" = (
/obj/structure/sign/mining/survival{
tag = "icon-survival (NORTH)";
icon_state = "survival";
dir = 1
},
/turf/closed/wall/mineral/titanium/survival/pod,
/area/survivalpod)
"c" = (
/turf/closed/wall/mineral/titanium/survival,
/area/survivalpod)
"d" = (
/obj/structure/sign/mining/survival{
dir = 8
},
/turf/closed/wall/mineral/titanium/survival/pod,
/area/survivalpod)
"e" = (
/obj/structure/fans,
/turf/open/floor/pod,
/area/survivalpod)
"f" = (
/obj/machinery/smartfridge/survival_pod,
/turf/open/floor/pod,
/area/survivalpod)
"g" = (
/obj/item/device/gps/computer,
/turf/open/floor/pod,
/area/survivalpod)
"h" = (
/obj/machinery/shower,
/obj/item/weapon/soap/deluxe,
/obj/structure/curtain{
alpha = 240;
color = "#454545";
icon_state = "closed";
open = 0
},
/turf/open/floor/pod,
/area/survivalpod)
"i" = (
/obj/structure/toilet/secret{
secret_type = /obj/item/weapon/kitchen/knife/combat/survival
},
/turf/open/floor/pod,
/area/survivalpod)
"j" = (
/obj/structure/sign/mining/survival{
tag = "icon-survival (EAST)";
icon_state = "survival";
dir = 4
},
/turf/closed/wall/mineral/titanium/survival/pod,
/area/survivalpod)
"k" = (
/obj/machinery/sleeper/survival_pod,
/turf/open/floor/pod,
/area/survivalpod)
"l" = (
/turf/open/floor/pod,
/area/survivalpod)
"m" = (
/obj/structure/bed/pod,
/obj/item/weapon/bedsheet/black,
/turf/open/floor/pod,
/area/survivalpod)
"n" = (
/obj/structure/window/reinforced/survival_pod{
dir = 8;
icon_state = "pwindow";
layer = 3;
tag = "icon-pwindow (WEST)"
},
/obj/machinery/door/window/survival_pod{
dir = 1;
icon_state = "windoor";
tag = "icon-windoor (NORTH)"
},
/turf/open/floor/carpet/black,
/area/survivalpod)
"o" = (
/obj/structure/chair/comfy/black,
/obj/item/cardboard_cutout{
desc = "A cardboard cutout of a xenomorph maid.";
icon_state = "cutout_lusty";
name = "lusty xenomorph maid"
},
/obj/structure/window/reinforced/survival_pod{
tag = "icon-pwindow (NORTH)";
icon_state = "pwindow";
dir = 1
},
/turf/open/floor/carpet/black,
/area/survivalpod)
"p" = (
/obj/structure/table/survival_pod,
/obj/item/weapon/storage/firstaid/regular,
/obj/item/weapon/storage/firstaid/brute{
pixel_x = 5
},
/turf/open/floor/pod,
/area/survivalpod)
"q" = (
/obj/structure/tubes,
/obj/item/weapon/twohanded/required/kirbyplants/random,
/turf/open/floor/pod,
/area/survivalpod)
"r" = (
/obj/structure/window/reinforced/survival_pod{
dir = 8;
icon_state = "pwindow";
tag = "icon-pwindow (WEST)"
},
/turf/open/floor/carpet/black,
/area/survivalpod)
"s" = (
/obj/machinery/light{
dir = 4;
light_color = "#DDFFD3"
},
/obj/structure/table/wood/fancy/black,
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{
pixel_x = 7;
pixel_y = 2
},
/obj/item/weapon/reagent_containers/food/drinks/bottle/wine{
pixel_x = -6;
pixel_y = 10
},
/turf/open/floor/carpet/black,
/area/survivalpod)
"t" = (
/obj/machinery/microwave{
pixel_y = -2
},
/obj/structure/window/reinforced/survival_pod{
tag = "icon-pwindow (NORTH)";
icon_state = "pwindow";
dir = 1
},
/obj/structure/table/wood/fancy/black{
pixel_y = -9;
pixel_z = 0
},
/turf/open/floor/carpet/black,
/area/survivalpod)
"u" = (
/obj/machinery/door/window/survival_pod{
tag = "icon-windoor (NORTH)";
icon_state = "windoor";
dir = 1
},
/turf/open/floor/carpet/black,
/area/survivalpod)
"v" = (
/obj/structure/window/reinforced/survival_pod{
tag = "icon-pwindow (NORTH)";
icon_state = "pwindow";
dir = 1
},
/obj/structure/displaycase{
alert = 0;
desc = "A display case containing an expensive forgery, probably.";
pixel_w = 0;
pixel_x = 0;
pixel_y = -4;
pixel_z = 0;
req_access = 48;
start_showpiece_type = /obj/item/fakeartefact
},
/turf/open/floor/carpet/black,
/area/survivalpod)
"w" = (
/obj/structure/window/reinforced/survival_pod{
density = 0;
dir = 9;
icon_state = "pwindow";
tag = "icon-pwindow (NORTHWEST)"
},
/turf/open/floor/carpet/black,
/area/survivalpod)
"x" = (
/obj/structure/table/wood/fancy/black,
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{
pixel_x = 7;
pixel_y = 2
},
/obj/effect/spawner/lootdrop/three_course_meal,
/turf/open/floor/carpet/black,
/area/survivalpod)
"y" = (
/obj/structure/sink/kitchen{
tag = "icon-sink_alt (EAST)";
icon_state = "sink_alt";
dir = 4;
pixel_x = -13;
pixel_y = 0
},
/turf/open/floor/carpet/black,
/area/survivalpod)
"z" = (
/obj/machinery/light,
/turf/open/floor/carpet/black,
/area/survivalpod)
"A" = (
/turf/open/floor/carpet/black,
/area/survivalpod)
"B" = (
/obj/structure/chair/comfy/black{
dir = 1
},
/turf/open/floor/carpet/black,
/area/survivalpod)
"C" = (
/obj/structure/sign/mining/survival,
/turf/closed/wall/mineral/titanium/survival/pod,
/area/survivalpod)
"D" = (
/obj/structure/fans/tiny,
/obj/machinery/door/airlock/survival_pod,
/turf/open/floor/pod,
/area/survivalpod)
"E" = (
/obj/structure/sign/mining,
/turf/closed/wall/mineral/titanium/survival/pod,
/area/survivalpod)
(1,1,1) = {"
a
d
c
d
c
d
a
"}
(2,1,1) = {"
b
e
k
p
t
y
C
"}
(3,1,1) = {"
c
f
l
l
u
z
c
"}
(4,1,1) = {"
b
g
m
q
v
A
D
"}
(5,1,1) = {"
c
h
n
r
w
A
c
"}
(6,1,1) = {"
b
i
o
s
x
B
E
"}
(7,1,1) = {"
a
j
c
j
c
j
a
"}
bot/config.py
-1
View File
@@ -1,7 +1,6 @@
# Configuration for the minibot.py bot starts here
server = "irc.rizon.net"
port = 6667
nudge_port = 45678
channels = ["#asdfgbus", "#botbus"]
defaultchannel = "#asdfgbus"
bot/minibot.py
+1 -1
View File
@@ -73,7 +73,7 @@ def setup_irc_socket():
def setup_nudge_socket():
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.bind(("", nudge_port)) # localhost:nudge_port
s.bind(("", 45678)) # localhost:nudge_port
s.listen(5)
logger.info("Nudge socket up and listening")
return s
bot/nudge.py
+24 -24
View File
@@ -1,25 +1,25 @@
#!/usr/bin/env python3
#!/usr/bin/env python3
from config import *
import sys
import pickle
import socket
def pack():
ip = sys.argv[1]
try:
data = sys.argv[2:]
except:
data = "NO DATA SPECIFIED"
nudge(pickle.dumps({"ip": ip, "data": data}))
def nudge(data):
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.connect(("localhost", nudge_port))
s.send(data)
s.close()
if __name__ == "__main__" and len(sys.argv) > 1:
pack()
import sys
import pickle
import socket
def pack():
ip = sys.argv[1]
try:
data = sys.argv[2:]
except:
data = "NO DATA SPECIFIED"
nudge(pickle.dumps({"ip": ip, "data": data}))
def nudge(data):
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.connect(("localhost", 45678))
s.send(data)
s.close()
if __name__ == "__main__" and len(sys.argv) > 1:
pack()
code/__DEFINES/DNA.dm
+1
View File
@@ -23,6 +23,7 @@
#define WACKY "Wacky"
#define MUT_MUTE "Mute"
#define SMILE "Smile"
#define STONER "Stoner"
#define UNINTELLIGABLE "Unintelligable"
#define SWEDISH "Swedish"
#define CHAV "Chav"
code/__DEFINES/MC.dm
+4 -4
View File
@@ -1,12 +1,12 @@
#define MC_TICK_CHECK ( ( world.tick_usage > GLOB.CURRENT_TICKLIMIT || src.state != SS_RUNNING ) ? pause() : 0 )
#define MC_TICK_CHECK ( ( world.tick_usage > Master.current_ticklimit || src.state != SS_RUNNING ) ? pause() : 0 )
#define MC_SPLIT_TICK_INIT(phase_count) var/original_tick_limit = GLOB.CURRENT_TICKLIMIT; var/split_tick_phases = ##phase_count
#define MC_SPLIT_TICK_INIT(phase_count) var/original_tick_limit = Master.current_ticklimit; var/split_tick_phases = ##phase_count
#define MC_SPLIT_TICK \
if(split_tick_phases > 1){\
GLOB.CURRENT_TICKLIMIT = ((original_tick_limit - world.tick_usage) / split_tick_phases) + world.tick_usage;\
Master.current_ticklimit = ((original_tick_limit - world.tick_usage) / split_tick_phases) + world.tick_usage;\
--split_tick_phases;\
} else {\
GLOB.CURRENT_TICKLIMIT = original_tick_limit;\
Master.current_ticklimit = original_tick_limit;\
}
// Used to smooth out costs to try and avoid oscillation.
code/__DEFINES/antagonists.dm
+16 -1
View File
@@ -5,4 +5,19 @@
#define ANTAG_DATUM_DEVIL /datum/antagonist/devil
#define ANTAG_DATUM_NINJA /datum/antagonist/ninja
#define ANTAG_DATUM_NINJA_FRIENDLY /datum/antagonist/ninja/friendly
#define ANTAG_DATUM_NINJA_RANDOM /datum/antagonist/ninja/randomAllegiance/
#define ANTAG_DATUM_NINJA_RANDOM /datum/antagonist/ninja/randomAllegiance/
#define ANTAG_DATUM_TRAITOR /datum/antagonist/traitor
#define ANTAG_DATUM_TRAITOR_CUSTOM /datum/antagonist/traitor/custom
#define ANTAG_DATUM_IAA /datum/antagonist/traitor/internal_affairs
#define ANTAG_DATUM_TRAITOR /datum/antagonist/traitor
#define ANTAG_DATUM_TRAITOR_CUSTOM /datum/antagonist/traitor/custom
#define ANTAG_DATUM_TRAITOR_HUMAN /datum/antagonist/traitor/human
#define ANTAG_DATUM_TRAITOR_HUMAN_CUSTOM /datum/antagonist/traitor/human/custom
#define ANTAG_DATUM_TRAITOR_AI /datum/antagonist/traitor/AI
#define ANTAG_DATUM_TRAITOR_AI_CUSTOM /datum/antagonist/traitor/AI/custom
#define ANTAG_DATUM_IAA /datum/antagonist/traitor/internal_affairs
#define ANTAG_DATUM_IAA_CUSTOM /datum/antagonist/traitor/internal_affairs/custom
#define ANTAG_DATUM_IAA_HUMAN /datum/antagonist/traitor/human/internal_affairs
#define ANTAG_DATUM_IAA_HUMAN_CUSTOM /datum/antagonist/traitor/human/internal_affairs/custom
#define ANTAG_DATUM_IAA_AI_CUSTOM /datum/antagonist/traitor/AI/internal_affairs/custom
#define ANTAG_DATUM_IAA_AI /datum/antagonist/traitor/AI/internal_affairs
code/__DEFINES/atmospherics.dm
+2
View File
@@ -171,3 +171,5 @@
#define ATMOS_PASS_PROC -1 //ask CanAtmosPass()
#define ATMOS_PASS_DENSITY -2 //just check density
#define CANATMOSPASS(A, O) ( A.CanAtmosPass == ATMOS_PASS_PROC ? A.CanAtmosPass(O) : ( A.CanAtmosPass == ATMOS_PASS_DENSITY ? !A.density : A.CanAtmosPass ) )
#define LAVALAND_DEFAULT_ATMOS "o2=14;n2=23;TEMP=300"
code/__DEFINES/clockcult.dm
+7 -5
View File
@@ -21,10 +21,10 @@ GLOBAL_LIST_EMPTY(all_scripture) //a list containing scripture instances; not us
#define SCRIPTURE_PERIPHERAL "Peripheral"
#define SCRIPTURE_DRIVER "Driver"
#define SCRIPTURE_SCRIPT "Script"
#define SCRIPT_SERVANT_REQ 5
#define SCRIPT_SERVANT_REQ 6
#define SCRIPT_CACHE_REQ 1
#define SCRIPTURE_APPLICATION "Application"
#define APPLICATION_SERVANT_REQ 8
#define APPLICATION_SERVANT_REQ 9
#define APPLICATION_CACHE_REQ 3
#define APPLICATION_CV_REQ 100
#define SCRIPTURE_REVENANT "Revenant"
@@ -58,7 +58,7 @@ GLOBAL_LIST_EMPTY(all_scripture) //a list containing scripture instances; not us
//clockcult power defines
#define MIN_CLOCKCULT_POWER 25 //the minimum amount of power clockcult machines will handle gracefully
#define CLOCKCULT_POWER_UNIT (MIN_CLOCKCULT_POWER*100) //standard power amount for clockwork proselytizer costs
#define CLOCKCULT_POWER_UNIT (MIN_CLOCKCULT_POWER*100) //standard power amount for replica fabricator costs
#define POWER_STANDARD (CLOCKCULT_POWER_UNIT*0.2) //how much power is in anything else; doesn't matter as much as the following
@@ -76,7 +76,7 @@ GLOBAL_LIST_EMPTY(all_scripture) //a list containing scripture instances; not us
#define POWER_PLASTEEL (CLOCKCULT_POWER_UNIT*0.05) //how much power is in one sheet of plasteel
#define RATVAR_POWER_CHECK "ratvar?" //when passed into can_use_power(), converts it into a check for if ratvar has woken/the proselytizer is debug
#define RATVAR_POWER_CHECK "ratvar?" //when passed into can_use_power(), converts it into a check for if ratvar has woken/the fabricator is debug
//Ark defines
#define GATEWAY_SUMMON_RATE 1 //the time amount the Gateway to the Celestial Derelict gets each process tick; defaults to 1 per tick
@@ -99,8 +99,10 @@ GLOBAL_LIST_EMPTY(all_scripture) //a list containing scripture instances; not us
#define SIGIL_ACCESS_RANGE 2 //range at which transmission sigils can access power
#define PROSELYTIZER_REPAIR_PER_TICK 4 //how much a proselytizer repairs each tick, and also how many deciseconds each tick is
#define FABRICATOR_REPAIR_PER_TICK 4 //how much a fabricator repairs each tick, and also how many deciseconds each tick is
#define OCULAR_WARDEN_EXCLUSION_RANGE 3 //the range at which ocular wardens cannot be placed near other ocular wardens
#define RATVARIAN_SPEAR_DURATION 1800 //how long ratvarian spears last; defaults to 3 minutes
#define PRISM_DELAY_DURATION 1200 //how long prolonging prisms delay the shuttle for; defaults to 2 minutes
code/__DEFINES/construction.dm
+3 -1
View File
@@ -95,11 +95,13 @@
//tablecrafting defines
#define CAT_NONE ""
#define CAT_WEAPON "Weaponry"
#define CAT_WEAPONRY "Weaponry"
#define CAT_WEAPON "Weapons"
#define CAT_AMMO "Ammunition"
#define CAT_ROBOT "Robots"
#define CAT_MISC "Misc"
#define CAT_PRIMAL "Tribal"
#define CAT_FOOD "Foods"
#define CAT_BREAD "Breads"
#define CAT_BURGER "Burgers"
#define CAT_CAKE "Cakes"
code/__DEFINES/flags.dm
+2
View File
@@ -14,6 +14,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
#define NOBLUDGEON 4 // when an item has this it produces no "X has been hit by Y with Z" message in the default attackby()
#define MASKINTERNALS 8 // mask allows internals
#define HEAR 16 // This flag is what recursive_hear_check() uses to determine wether to add an item to the hearer list or not.
#define CHECK_RICOCHET 32 // Projectiels will check ricochet on things impacted that have this.
#define CONDUCT 64 // conducts electricity (metal etc.)
#define ABSTRACT 128 // for all things that are technically items but used for various different stuff, made it 128 because it could conflict with other flags other way
#define NODECONSTRUCT 128 // For machines and structures that should not break into parts, eg, holodeck stuff
@@ -57,6 +58,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
#define UNUSED_TRANSIT_TURF 2
#define CAN_BE_DIRTY 4 //If a turf can be made dirty at roundstart. This is also used in areas.
#define NO_DEATHRATTLE 16 // Do not notify deadchat about any deaths that occur on this turf.
//#define CHECK_RICOCHET 32 //Same thing as atom flag.
/*
These defines are used specifically with the atom/pass_flags bitmask
code/__DEFINES/layers.dm
+6 -1
View File
@@ -14,10 +14,15 @@
#define CLOSED_TURF_LAYER 2.05
#define ABOVE_NORMAL_TURF_LAYER 2.08
#define LATTICE_LAYER 2.2
#define OVER_LATTICE_LAYER 2.25
#define DISPOSAL_PIPE_LAYER 2.3
#define GAS_PIPE_LAYER 2.35
#define GAS_PIPE_HIDDEN_LAYER 2.35
#define WIRE_LAYER 2.4
#define WIRE_TERMINAL_LAYER 2.45
#define GAS_SCRUBBER_LAYER 2.46
#define GAS_PIPE_VISIBLE_LAYER 2.47
#define GAS_FILTER_LAYER 2.48
#define GAS_PUMP_LAYER 2.49
#define LOW_OBJ_LAYER 2.5
#define LOW_SIGIL_LAYER 2.52
#define SIGIL_LAYER 2.54
code/__DEFINES/lighting.dm
+2
View File
@@ -51,8 +51,10 @@
#define LIGHT_COLOR_GREEN "#64C864" //Bright but quickly dissipating neon green. rgb(100, 200, 100)
#define LIGHT_COLOR_BLUE "#6496FA" //Cold, diluted blue. rgb(100, 150, 250)
#define LIGHT_COLOR_BLUEGREEN "#7DE1AF" //Light blueish green. rgb(125, 225, 175)
#define LIGHT_COLOR_CYAN "#7DE1E1" //Diluted cyan. rgb(125, 225, 225)
#define LIGHT_COLOR_LIGHT_CYAN "#40CEFF" //More-saturated cyan. rgb(64, 206, 255)
#define LIGHT_COLOR_DARK_BLUE "#6496FA" //Saturated blue. rgb(51, 117, 248)
#define LIGHT_COLOR_PINK "#E17DE1" //Diluted, mid-warmth pink. rgb(225, 125, 225)
#define LIGHT_COLOR_YELLOW "#E1E17D" //Dimmed yellow, leaning kaki. rgb(225, 225, 125)
#define LIGHT_COLOR_BROWN "#966432" //Clear brown, mostly dim. rgb(150, 100, 50)
code/__DEFINES/logging.dm
+18
View File
@@ -0,0 +1,18 @@
//Investigate logging defines
#define INVESTIGATE_ATMOS "atmos"
#define INVESTIGATE_BOTANY "botany"
#define INVESTIGATE_CARGO "cargo"
#define INVESTIGATE_EXPERIMENTOR "experimentor"
#define INVESTIGATE_GRAVITY "gravity"
#define INVESTIGATE_RECORDS "records"
#define INVESTIGATE_SINGULO "singulo"
#define INVESTIGATE_SUPERMATTER "supermatter"
#define INVESTIGATE_TELESCI "telesci"
#define INVESTIGATE_WIRES "wires"
//Individual logging defines
#define INDIVIDUAL_ATTACK_LOG "Attack log"
#define INDIVIDUAL_SAY_LOG "Say log"
#define INDIVIDUAL_EMOTE_LOG "Emote log"
#define INDIVIDUAL_OOC_LOG "OOC log"
#define INDIVIDUAL_SHOW_ALL_LOG "All logs"
code/__DEFINES/machines.dm
+18 -1
View File
@@ -7,6 +7,11 @@
#define STATIC_LIGHT 6
#define STATIC_ENVIRON 7
//Power use
#define NO_POWER_USE 0
#define IDLE_POWER_USE 1
#define ACTIVE_POWER_USE 2
//bitflags for door switches.
#define OPEN 1
@@ -66,4 +71,16 @@
#define PROGRAM_STATE_ACTIVE 2
#define FIREDOOR_OPEN 1
#define FIREDOOR_CLOSED 2
#define FIREDOOR_CLOSED 2
// These are used by supermatter and supermatter monitor program, mostly for UI updating purposes. Higher should always be worse!
#define SUPERMATTER_ERROR -1 // Unknown status, shouldn't happen but just in case.
#define SUPERMATTER_INACTIVE 0 // No or minimal energy
#define SUPERMATTER_NORMAL 1 // Normal operation
#define SUPERMATTER_NOTIFY 2 // Ambient temp > 80% of CRITICAL_TEMPERATURE
#define SUPERMATTER_WARNING 3 // Ambient temp > CRITICAL_TEMPERATURE OR integrity damaged
#define SUPERMATTER_DANGER 4 // Integrity < 50%
#define SUPERMATTER_EMERGENCY 5 // Integrity < 25%
#define SUPERMATTER_DELAMINATING 6 // Pretty obvious.
code/__DEFINES/maps.dm
+5 -4
View File
@@ -34,13 +34,14 @@ Last space-z level = empty
#define MAP_REMOVE_JOB(jobpath) /datum/job/##jobpath/map_check() { return (SSmapping.config.map_name != JOB_MODIFICATION_MAP_NAME) && ..() }
//zlevel defines, can be overridden for different maps in the appropriate _maps file.
#define ZLEVEL_STATION 1
#define ZLEVEL_CENTCOM 2
#define ZLEVEL_CENTCOM 1
#define ZLEVEL_STATION 2
#define ZLEVEL_MINING 5
#define ZLEVEL_LAVALAND 5
#define ZLEVEL_EMPTY_SPACE 11
#define ZLEVEL_EMPTY_SPACE 12
#define ZLEVEL_TRANSIT 11
#define ZLEVEL_SPACEMIN 3
#define ZLEVEL_SPACEMAX 11
#define ZLEVEL_SPACEMAX 12
#define SPACERUIN_MAP_EDGE_PAD 15
code/__DEFINES/misc.dm
+33
View File
@@ -4,6 +4,19 @@
// #define EAST 4
// #define WEST 8
//These get to go at the top, because they're special
//You can use these defines to get the typepath of the currently running proc/verb (yes procs + verbs are objects)
/* eg:
/mob/living/carbon/human/death()
world << THIS_PROC_TYPE_STR //You can only output the string versions
Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a string with () (eg: the _WITH_ARGS defines) to make it look nicer)
*/
#define THIS_PROC_TYPE .....
#define THIS_PROC_TYPE_STR "[THIS_PROC_TYPE]" //Because you can only obtain a string of THIS_PROC_TYPE using "[]", and it's nice to just +/+= strings
#define THIS_PROC_TYPE_STR_WITH_ARGS "[THIS_PROC_TYPE]([args.Join(",")])"
#define THIS_PROC_TYPE_WEIRD ...... //This one is WEIRD, in some cases (When used in certain defines? (eg: ASSERT)) THIS_PROC_TYPE will fail to work, but THIS_PROC_TYPE_WEIRD will work instead
#define THIS_PROC_TYPE_WEIRD_STR "[THIS_PROC_TYPE_WEIRD]" //Included for completeness
#define THIS_PROC_TYPE_WEIRD_STR_WITH_ARGS "[THIS_PROC_TYPE_WEIRD]([args.Join(",")])" //Ditto
#define MIDNIGHT_ROLLOVER 864000 //number of deciseconds in a day
@@ -165,6 +178,7 @@
// Used by NewsCaster and NewsPaper.
// Used by Modular Computers
#define PEN_FONT "Verdana"
#define FOUNTAIN_PEN_FONT "Segoe Script"
#define CRAYON_FONT "Comic Sans MS"
#define PRINTER_FONT "Times New Roman"
#define SIGNFONT "Times New Roman"
@@ -411,3 +425,22 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
#define NO_FIELD 0
#define FIELD_TURF 1
#define FIELD_EDGE 2
//gibtonite state defines
#define GIBTONITE_UNSTRUCK 0
#define GIBTONITE_ACTIVE 1
#define GIBTONITE_STABLE 2
#define GIBTONITE_DETONATE 3
//for obj explosion block calculation
#define EXPLOSION_BLOCK_PROC -1
//Gangster starting influences
#define GANGSTER_SOLDIER_STARTING_INFLUENCE 5
#define GANGSTER_BOSS_STARTING_INFLUENCE 20
//for determining which type of heartbeat sound is playing
#define BEAT_FAST 1
#define BEAT_SLOW 2
#define BEAT_NONE 0
#define BEAT_CHANNEL 150
code/__DEFINES/misc.dm.rej
+7
View File
@@ -0,0 +1,7 @@
diff a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm (rejected hunks)
@@ -440,4 +440,4 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
#define BEAT_SLOW 2
#define BEAT_NONE 0
-#define BEAT_CHANNEL 150 //sound channel for heartbeats
+
code/__DEFINES/mobs.dm
+21 -7
View File
@@ -2,6 +2,12 @@
//Misc mob defines
//Ready states at roundstart for mob/dead/new_player
#define PLAYER_NOT_READY 0
#define PLAYER_READY_TO_PLAY 1
#define PLAYER_READY_TO_OBSERVE 2
//movement intent defines for the m_intent var
#define MOVE_INTENT_WALK "walk"
#define MOVE_INTENT_RUN "run"
@@ -80,6 +86,15 @@
#define AI_IDLE 2
#define AI_OFF 3
#define ENVIRONMENT_SMASH_NONE 0
#define ENVIRONMENT_SMASH_STRUCTURES 1
#define ENVIRONMENT_SMASH_WALLS 2
#define ENVIRONMENT_SMASH_RWALLS 3
//SNPCs
//AI defines
#define INTERACTING 2
@@ -105,13 +120,6 @@
#define SNPC_MARTYR 3
#define SNPC_PSYCHO 4
//Individual logging defines
#define INDIVIDUAL_ATTACK_LOG "Attack log"
#define INDIVIDUAL_SAY_LOG "Say log"
#define INDIVIDUAL_EMOTE_LOG "Emote log"
#define INDIVIDUAL_OOC_LOG "OOC log"
#define INDIVIDUAL_SHOW_ALL_LOG "All logs"
#define TK_MAXRANGE 15
#define NO_SLIP_WHEN_WALKING 1
@@ -122,3 +130,9 @@
#define MAX_CHICKENS 50
#define UNHEALING_EAR_DAMAGE 100
#define INCORPOREAL_MOVE_BASIC 1
#define INCORPOREAL_MOVE_SHADOW 2 // leaves a trail of shadows
#define INCORPOREAL_MOVE_JAUNT 3 // is blocked by holy water/salt
#define MEGAFAUNA_DEFAULT_RECOVERY_TIME 5
code/__DEFINES/reagents.dm
+3 -1
View File
@@ -2,7 +2,9 @@
#define LIQUID 2
#define GAS 3
#define OPENCONTAINER 4096 // is an open container for chemistry purposes
#define INJECTABLE 1024 //Makes reagents addable through droppers and syringes
#define DRAWABLE 2048 //If a syringe can draw from it
#define OPENCONTAINER 4096 //Is an open container for chemistry purposes
#define TRANSPARENT 8192 //Used for non-open containers which you still want to be able to see the reagents off.
#define TOUCH 1 //splashing
code/__DEFINES/server_tools.dm
+29
View File
@@ -0,0 +1,29 @@
#define REBOOT_MODE_NORMAL 0
#define REBOOT_MODE_HARD 1
#define REBOOT_MODE_SHUTDOWN 2
#define IRC_STATUS_THROTTLE 5
//keep these in sync with TGS3
#define SERVICE_WORLD_PARAM "server_service"
#define SERVICE_PR_TEST_JSON "..\\..\\prtestjob.json"
#define SERVICE_CMD_HARD_REBOOT "hard_reboot"
#define SERVICE_CMD_GRACEFUL_SHUTDOWN "graceful_shutdown"
#define SERVICE_CMD_WORLD_ANNOUNCE "world_announce"
#define SERVICE_CMD_IRC_CHECK "irc_check"
#define SERVICE_CMD_IRC_STATUS "irc_status"
#define SERVICE_CMD_ADMIN_MSG "adminmsg"
#define SERVICE_CMD_NAME_CHECK "namecheck"
#define SERVICE_CMD_ADMIN_WHO "adminwho"
//#define SERVICE_CMD_PARAM_KEY //defined in __compile_options.dm
#define SERVICE_CMD_PARAM_COMMAND "command"
#define SERVICE_CMD_PARAM_MESSAGE "message"
#define SERVICE_CMD_PARAM_TARGET "target"
#define SERVICE_CMD_PARAM_SENDER "sender"
#define SERVICE_REQUEST_KILL_PROCESS "killme"
#define SERVICE_REQUEST_IRC_BROADCAST "irc"
#define SERVICE_REQUEST_IRC_ADMIN_CHANNEL_MESSAGE "send2irc"
#define SERVICE_REQUEST_WORLD_REBOOT "worldreboot"
code/__DEFINES/shuttles.dm
+7 -1
View File
@@ -27,6 +27,7 @@
#define UNLAUNCHED 0
#define ENDGAME_LAUNCHED 1
#define EARLY_LAUNCHED 2
#define ENDGAME_TRANSIT 3
// Ripples, effects that signal a shuttle's arrival
#define SHUTTLE_RIPPLE_TIME 100
@@ -45,4 +46,9 @@
#define HYPERSPACE_LAUNCH 2
#define HYPERSPACE_END 3
#define CALL_SHUTTLE_REASON_LENGTH 12
#define CALL_SHUTTLE_REASON_LENGTH 12
//Engine related
#define ENGINE_COEFF_MIN 0.5
#define ENGINE_COEFF_MAX 2
#define ENGINE_DEFAULT_MAXSPEED_ENGINES 5
code/__DEFINES/sound.dm
+1
View File
@@ -3,6 +3,7 @@
#define CHANNEL_ADMIN 1023
#define CHANNEL_VOX 1022
#define CHANNEL_JUKEBOX 1021
#define CHANNEL_HEARTBEAT 1019 //sound channel for heartbeats
//Citadel code
#define CHANNEL_PRED 1020
code/__DEFINES/sound.dm.rej
+8
View File
@@ -0,0 +1,8 @@
diff a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm (rejected hunks)
@@ -9,5 +9,5 @@
//THIS SHOULD ALWAYS BE THE LOWEST ONE!
//KEEP IT UPDATED
-#define CHANNEL_HIGHEST_AVAILABLE 1019
+#define CHANNEL_HIGHEST_AVAILABLE 1018
code/__DEFINES/status_effects.dm
+13 -2
View File
@@ -30,7 +30,6 @@
// DEBUFFS //
/////////////
#define STATUS_EFFECT_SIGILMARK /datum/status_effect/sigil_mark
#define STATUS_EFFECT_BELLIGERENT /datum/status_effect/belligerent //forces the affected to walk, doing damage if they try to run
#define STATUS_EFFECT_MANIAMOTOR /datum/status_effect/maniamotor //disrupts, damages, and confuses the affected as long as they're in range of the motor
@@ -39,4 +38,16 @@
#define STATUS_EFFECT_HISWRATH /datum/status_effect/his_wrath //His Wrath.
#define STATUS_EFFECT_SUMMONEDGHOST /datum/status_effect/cultghost //is a cult ghost and can't use manifest runes
#define STATUS_EFFECT_SUMMONEDGHOST /datum/status_effect/cultghost //is a cult ghost and can't use manifest runes
#define STATUS_EFFECT_CRUSHERMARK /datum/status_effect/crusher_mark //if struck with a proto-kinetic crusher, takes a ton of damage
/////////////
// NEUTRAL //
/////////////
#define STATUS_EFFECT_SIGILMARK /datum/status_effect/sigil_mark
#define STATUS_EFFECT_CRUSHERDAMAGETRACKING /datum/status_effect/crusher_damage //tracks total kinetic crusher damage on a target
#define STATUS_EFFECT_SYPHONMARK /datum/status_effect/syphon_mark //tracks kills for the KA death syphon module
code/__DEFINES/subsystems.dm
+8 -2
View File
@@ -14,7 +14,9 @@
//prevents distinguishing identical timers with the wait variable
#define TIMER_NO_HASH_WAIT 0x10
#define TIMER_NO_INVOKE_WARNING 200 //number of byond ticks that are allowed to pass before the timer subsystem thinks it hung on something
#define TIMER_NO_INVOKE_WARNING 600 //number of byond ticks that are allowed to pass before the timer subsystem thinks it hung on something
#define TIMER_ID_NULL -1
//For servers that can't do with any additional lag, set this to none in flightpacks.dm in subsystem/processing.
#define FLIGHTSUIT_PROCESSING_NONE 0
@@ -39,8 +41,12 @@
// Subsystem init_order, from highest priority to lowest priority
// Subsystems shutdown in the reverse of the order they initialize in
// The numbers just define the ordering, they are meaningless otherwise.
#define INIT_ORDER_DBCORE 18
#define INIT_ORDER_BLACKBOX 17
#define INIT_ORDER_SERVER_MAINT 16
#define INIT_ORDER_JOBS 15
#define INIT_ORDER_EVENTS 14
#define INIT_ORDER_TICKER 13
@@ -70,4 +76,4 @@
#define RUNLEVEL_GAME 4
#define RUNLEVEL_POSTGAME 8
#define RUNLEVELS_DEFAULT (RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME)
#define RUNLEVELS_DEFAULT (RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME)
code/__DEFINES/tick.dm
+1 -1
View File
@@ -3,5 +3,5 @@
#define TICK_LIMIT_MC 70
#define TICK_LIMIT_MC_INIT_DEFAULT 98
#define TICK_CHECK ( world.tick_usage > GLOB.CURRENT_TICKLIMIT )
#define TICK_CHECK ( world.tick_usage > Master.current_ticklimit )
#define CHECK_TICK if TICK_CHECK stoplag()
code/__DEFINES/wires.dm
+2 -2
View File
@@ -3,8 +3,8 @@
#define WIRE_AI "AI Connection"
#define WIRE_ALARM "Alarm"
#define WIRE_AVOIDANCE "Avoidance"
#define WIRE_BACKUP1 "Auxillary Power 1"
#define WIRE_BACKUP2 "Auxillary Power 2"
#define WIRE_BACKUP1 "Auxiliary Power 1"
#define WIRE_BACKUP2 "Auxiliary Power 2"
#define WIRE_BEACON "Beacon"
#define WIRE_BOLTS "Bolts"
#define WIRE_BOOM "Boom"
code/__HELPERS/_lists.dm
+12 -10
View File
@@ -48,23 +48,23 @@
//Checks if the list is empty
/proc/isemptylist(list/L)
if(!L.len)
return 1
return 0
return TRUE
return FALSE
//Checks for specific types in a list
/proc/is_type_in_list(atom/A, list/L)
if(!L || !L.len || !A)
return 0
return FALSE
for(var/type in L)
if(istype(A, type))
return 1
return 0
return TRUE
return FALSE
//Checks for specific types in specifically structured (Assoc "type" = TRUE) lists ('typecaches')
/proc/is_type_in_typecache(atom/A, list/L)
if(!L || !L.len || !A)
return 0
return FALSE
if(ispath(A))
. = L[A]
else
@@ -76,7 +76,7 @@
return
for(var/V in L)
if(string == V)
return 1
return TRUE
return
//Removes a string from a list
@@ -131,9 +131,12 @@
return
//Removes any null entries from the list
//Returns TRUE if the list had nulls, FALSE otherwise
/proc/listclearnulls(list/L)
var/list/N = new(L.len)
var/start_len = L.len
var/list/N = new(start_len)
L -= N
return L.len < start_len
/*
* Returns list containing all the entries from first list that are not present in second.
@@ -448,13 +451,12 @@
//Picks from the list, with some safeties, and returns the "default" arg if it fails
#define DEFAULTPICK(L, default) ((istype(L, /list) && L:len) ? pick(L) : default)
#define LAZYINITLIST(L) if (!L) L = list()
#define UNSETEMPTY(L) if (L && !L.len) L = null
#define LAZYREMOVE(L, I) if(L) { L -= I; if(!L.len) { L = null; } }
#define LAZYADD(L, I) if(!L) { L = list(); } L += I;
#define LAZYACCESS(L, I) (L ? (isnum(I) ? (I > 0 && I <= L.len ? L[I] : null) : L[I]) : null)
#define LAZYSET(L, K, V) if(!L) { L = list(); } L[K] = V;
#define LAZYLEN(L) length(L)
#define LAZYCLEARLIST(L) if(L) L.Cut()
#define SANITIZE_LIST(L) ( islist(L) ? L : list() )
code/__HELPERS/files.dm
+64 -64
View File
@@ -1,64 +1,64 @@
//Sends resource files to client cache
/client/proc/getFiles()
for(var/file in args)
src << browse_rsc(file)
/client/proc/browse_files(root="data/logs/", max_iterations=10, list/valid_extensions=list(".txt",".log",".htm"))
var/path = root
for(var/i=0, i<max_iterations, i++)
var/list/choices = flist(path)
if(path != root)
choices.Insert(1,"/")
var/choice = input(src,"Choose a file to access:","Download",null) as null|anything in choices
switch(choice)
if(null)
return
if("/")
path = root
continue
path += choice
if(copytext(path,-1,0) != "/") //didn't choose a directory, no need to iterate again
break
var/extension = copytext(path,-4,0)
if( !fexists(path) || !(extension in valid_extensions) )
to_chat(src, "<font color='red'>Error: browse_files(): File not found/Invalid file([path]).</font>")
return
return path
#define FTPDELAY 200 //200 tick delay to discourage spam
/* This proc is a failsafe to prevent spamming of file requests.
It is just a timer that only permits a download every [FTPDELAY] ticks.
This can be changed by modifying FTPDELAY's value above.
PLEASE USE RESPONSIBLY, Some log files can reach sizes of 4MB! */
/client/proc/file_spam_check()
var/time_to_wait = GLOB.fileaccess_timer - world.time
if(time_to_wait > 0)
to_chat(src, "<font color='red'>Error: file_spam_check(): Spam. Please wait [round(time_to_wait/10)] seconds.</font>")
return 1
GLOB.fileaccess_timer = world.time + FTPDELAY
return 0
#undef FTPDELAY
/proc/pathwalk(path)
var/list/jobs = list(path)
var/list/filenames = list()
while(jobs.len)
var/current_dir = pop(jobs)
var/list/new_filenames = flist(current_dir)
for(var/new_filename in new_filenames)
// if filename ends in / it is a directory, append to currdir
if(findtext(new_filename, "/", -1))
jobs += current_dir + new_filename
else
filenames += current_dir + new_filename
return filenames
/proc/pathflatten(path)
return replacetext(path, "/", "_")
//Sends resource files to client cache
/client/proc/getFiles()
for(var/file in args)
src << browse_rsc(file)
/client/proc/browse_files(root="data/logs/", max_iterations=10, list/valid_extensions=list(".txt",".log",".htm", ".html"))
var/path = root
for(var/i=0, i<max_iterations, i++)
var/list/choices = flist(path)
if(path != root)
choices.Insert(1,"/")
var/choice = input(src,"Choose a file to access:","Download",null) as null|anything in choices
switch(choice)
if(null)
return
if("/")
path = root
continue
path += choice
if(copytext(path,-1,0) != "/") //didn't choose a directory, no need to iterate again
break
var/extension = copytext(path,-4,0)
if( !fexists(path) || !(extension in valid_extensions) )
to_chat(src, "<font color='red'>Error: browse_files(): File not found/Invalid file([path]).</font>")
return
return path
#define FTPDELAY 200 //200 tick delay to discourage spam
/* This proc is a failsafe to prevent spamming of file requests.
It is just a timer that only permits a download every [FTPDELAY] ticks.
This can be changed by modifying FTPDELAY's value above.
PLEASE USE RESPONSIBLY, Some log files can reach sizes of 4MB! */
/client/proc/file_spam_check()
var/time_to_wait = GLOB.fileaccess_timer - world.time
if(time_to_wait > 0)
to_chat(src, "<font color='red'>Error: file_spam_check(): Spam. Please wait [round(time_to_wait/10)] seconds.</font>")
return 1
GLOB.fileaccess_timer = world.time + FTPDELAY
return 0
#undef FTPDELAY
/proc/pathwalk(path)
var/list/jobs = list(path)
var/list/filenames = list()
while(jobs.len)
var/current_dir = pop(jobs)
var/list/new_filenames = flist(current_dir)
for(var/new_filename in new_filenames)
// if filename ends in / it is a directory, append to currdir
if(findtext(new_filename, "/", -1))
jobs += current_dir + new_filename
else
filenames += current_dir + new_filename
return filenames
/proc/pathflatten(path)
return replacetext(path, "/", "_")
code/__HELPERS/game.dm
+2 -1
View File
@@ -507,7 +507,8 @@
return
//First we spawn a dude.
var/mob/living/carbon/human/new_character = new(pick(GLOB.latejoin))//The mob being spawned.
var/mob/living/carbon/human/new_character = new//The mob being spawned.
SSjob.SendToLateJoin(new_character)
G_found.client.prefs.copy_to(new_character)
new_character.dna.update_dna_identity()
code/__HELPERS/icon_smoothing.dm
+6 -15
View File
@@ -167,23 +167,14 @@
underlay_appearance.icon = fixed_underlay["icon"]
underlay_appearance.icon_state = fixed_underlay["icon_state"]
else
var/turf/T = get_step(src, turn(adjacencies, 180))
if(T && (T.density || T.smooth))
var/turned_adjacency = turn(adjacencies, 180)
var/turf/T = get_step(src, turned_adjacency)
if(!T.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency))
T = get_step(src, turn(adjacencies, 135))
if(T && (T.density || T.smooth))
if(!T.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency))
T = get_step(src, turn(adjacencies, 225))
if(isspaceturf(T) && !istype(T, /turf/open/space/transit))
underlay_appearance.icon = 'icons/turf/space.dmi'
underlay_appearance.icon_state = SPACE_ICON_STATE
underlay_appearance.plane = PLANE_SPACE
else if(T && !T.density && !T.smooth)
underlay_appearance.icon = T.icon
underlay_appearance.icon_state = T.icon_state
else if(baseturf && !initial(baseturf.density) && !initial(baseturf.smooth))
underlay_appearance.icon = initial(baseturf.icon)
underlay_appearance.icon_state = initial(baseturf.icon_state)
else
//if all else fails, ask our own turf
if(!T.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency) && !get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency))
underlay_appearance.icon = DEFAULT_UNDERLAY_ICON
underlay_appearance.icon_state = DEFAULT_UNDERLAY_ICON_STATE
underlays = U
code/__HELPERS/icons.dm
+1 -1
View File
@@ -167,7 +167,7 @@ mob
Output_Icon()
set name = "2. Output Icon"
to_chat(src, "Icon is: \icon[getFlatIcon(src)]")
to_chat(src, "Icon is: [bicon(getFlatIcon(src))]")
Label_Icon()
set name = "3. Label Icon"
code/__HELPERS/maths.dm
+16 -2
View File
@@ -130,6 +130,22 @@ GLOBAL_LIST_INIT(sqrtTable, list(1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4,
var/t = round((val - min) / d)
return val - (t * d)
#define NORM_ROT(rot) ((((rot % 360) + (rot - round(rot, 1))) > 0) ? ((rot % 360) + (rot - round(rot, 1))) : (((rot % 360) + (rot - round(rot, 1))) + 360))
/proc/get_angle_of_incidence(face_angle, angle_in, auto_normalize = TRUE)
var/angle_in_s = NORM_ROT(angle_in)
var/face_angle_s = NORM_ROT(face_angle)
var/incidence = face_angle_s - angle_in_s
var/incidence_s = incidence
while(incidence_s < -90)
incidence_s += 180
while(incidence_s > 90)
incidence_s -= 180
if(auto_normalize)
return incidence_s
else
return incidence
//A logarithm that converts an integer to a number scaled between 0 and 1 (can be tweaked to be higher).
//Currently, this is used for hydroponics-produce sprite transforming, but could be useful for other transform functions.
@@ -141,8 +157,6 @@ GLOBAL_LIST_INIT(sqrtTable, list(1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4,
return size_factor + scaling_modifier //scale mod of 0 results in a number from 0 to 1. A scale modifier of +0.5 returns 0.5 to 1.5
//to_chat(world, "Transform multiplier of [src] is [size_factor + scaling_modifer]")
//converts a uniform distributed random number into a normal distributed one
//since this method produces two random numbers, one is saved for subsequent calls
//(making the cost negligble for every second call)
code/__HELPERS/mobs.dm
+17 -14
View File
@@ -1,3 +1,6 @@
//wrapper macro for sending images that makes grepping easy
#define SEND_IMAGE(target, image) target << image
/proc/random_blood_type()
return pick(4;"O-", 36;"O+", 3;"A-", 28;"A+", 1;"B-", 20;"B+", 1;"AB-", 5;"AB+")
@@ -340,20 +343,20 @@ Proc for attack log creation, because really why not
qdel(progbar)
//some additional checks as a callback for for do_afters that want to break on losing health or on the mob taking action
/mob/proc/break_do_after_checks(list/checked_health, check_clicks)
if(check_clicks && next_move > world.time)
return FALSE
return TRUE
//pass a list in the format list("health" = mob's health var) to check health during this
/mob/living/break_do_after_checks(list/checked_health, check_clicks)
if(islist(checked_health))
if(health < checked_health["health"])
return FALSE
checked_health["health"] = health
return ..()
//some additional checks as a callback for for do_afters that want to break on losing health or on the mob taking action
/mob/proc/break_do_after_checks(list/checked_health, check_clicks)
if(check_clicks && next_move > world.time)
return FALSE
return TRUE
//pass a list in the format list("health" = mob's health var) to check health during this
/mob/living/break_do_after_checks(list/checked_health, check_clicks)
if(islist(checked_health))
if(health < checked_health["health"])
return FALSE
checked_health["health"] = health
return ..()
/proc/do_after(mob/user, delay, needhand = 1, atom/target = null, progress = 1, datum/callback/extra_checks = null)
if(!user)
return 0
code/__HELPERS/names.dm
+37 -33
View File
@@ -55,19 +55,19 @@ GLOBAL_VAR(command_name)
return capitalize(name)
/proc/station_name()
if(!GLOB.station_name)
var/newname
if(config && config.station_name)
newname = config.station_name
else
newname = new_station_name()
if(!GLOB.station_name)
var/newname
if(config && config.station_name)
newname = config.station_name
else
newname = new_station_name()
set_station_name(newname)
return GLOB.station_name
/proc/set_station_name(newname)
GLOB.station_name = newname
set_station_name(newname)
return GLOB.station_name
/proc/set_station_name(newname)
GLOB.station_name = newname
if(config && config.server_name)
world.name = "[config.server_name][config.server_name==GLOB.station_name ? "" : ": [GLOB.station_name]"]"
@@ -167,9 +167,13 @@ GLOBAL_VAR(syndicate_code_response) //Code response for traitors.
/N
*/
/proc/generate_code_phrase()//Proc is used for phrase and response in master_controller.dm
/proc/generate_code_phrase(return_list=FALSE)//Proc is used for phrase and response in master_controller.dm
if(!return_list)
. = ""
else
. = list()
var/code_phrase = ""//What is returned when the proc finishes.
var/words = pick(//How many words there will be. Minimum of two. 2, 4 and 5 have a lesser chance of being selected. 3 is the most likely.
50; 2,
200; 3,
@@ -204,39 +208,39 @@ GLOBAL_VAR(syndicate_code_response) //Code response for traitors.
switch(rand(1,2))//Mainly to add more options later.
if(1)
if(names.len&&prob(70))
code_phrase += pick(names)
. += pick(names)
else
if(prob(10))
code_phrase += pick(lizard_name(MALE),lizard_name(FEMALE))
. += pick(lizard_name(MALE),lizard_name(FEMALE))
else
code_phrase += pick(pick(GLOB.first_names_male,GLOB.first_names_female))
code_phrase += " "
code_phrase += pick(GLOB.last_names)
var/new_name = pick(pick(GLOB.first_names_male,GLOB.first_names_female))
new_name += " "
new_name += pick(GLOB.last_names)
. += new_name
if(2)
code_phrase += pick(get_all_jobs())//Returns a job.
. += pick(get_all_jobs())//Returns a job.
safety -= 1
if(2)
switch(rand(1,3))//Food, drinks, or things. Only selectable once.
if(1)
code_phrase += lowertext(pick(drinks))
. += lowertext(pick(drinks))
if(2)
code_phrase += lowertext(pick(foods))
. += lowertext(pick(foods))
if(3)
code_phrase += lowertext(pick(locations))
. += lowertext(pick(locations))
safety -= 2
if(3)
switch(rand(1,4))//Abstract nouns, objects, adjectives, threats. Can be selected more than once.
if(1)
code_phrase += lowertext(pick(nouns))
. += lowertext(pick(nouns))
if(2)
code_phrase += lowertext(pick(objects))
. += lowertext(pick(objects))
if(3)
code_phrase += lowertext(pick(adjectives))
. += lowertext(pick(adjectives))
if(4)
code_phrase += lowertext(pick(threats))
if(words==1)
code_phrase += "."
else
code_phrase += ", "
return code_phrase
. += lowertext(pick(threats))
if(!return_list)
if(words==1)
. += "."
else
. += ", "
code/__HELPERS/sorts/__main.dm
+2 -3
View File
@@ -626,14 +626,13 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sortInstance, new())
var/val2 = fetchElement(L,cursor2)
while(1)
if(call(cmp)(val1,val2) < 0)
if(call(cmp)(val1,val2) <= 0)
if(++cursor1 >= end1)
break
val1 = fetchElement(L,cursor1)
else
moveElement(L,cursor2,cursor1)
++cursor2
if(++cursor2 >= end2)
break
++end1
@@ -653,4 +652,4 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sortInstance, new())
#undef MIN_GALLOP
#undef MIN_MERGE
#undef fetchElement
#undef fetchElement
code/__HELPERS/unsorted.dm
+23 -15
View File
@@ -723,7 +723,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
//Irregular objects
var/icon/AMicon = icon(AM.icon, AM.icon_state)
var/icon/AMiconheight = AMicon.Height()
var/icon/AMiconwidth = AMicon.Width()
var/icon/AMiconwidth = AMicon.Width()
if(AMiconheight != world.icon_size || AMiconwidth != world.icon_size)
pixel_x_offset += ((AMicon.Width()/world.icon_size)-1)*(world.icon_size*0.5)
pixel_y_offset += ((AMicon.Height()/world.icon_size)-1)*(world.icon_size*0.5)
@@ -834,11 +834,11 @@ GLOBAL_LIST_INIT(WALLITEMS_INVERSE, typecacheof(list(
/obj/proc/atmosanalyzer_scan(datum/gas_mixture/air_contents, mob/user, obj/target = src)
var/obj/icon = target
user.visible_message("[user] has used the analyzer on \icon[icon] [target].", "<span class='notice'>You use the analyzer on \icon[icon] [target].</span>")
user.visible_message("[user] has used the analyzer on [bicon(icon)] [target].", "<span class='notice'>You use the analyzer on [bicon(icon)] [target].</span>")
var/pressure = air_contents.return_pressure()
var/total_moles = air_contents.total_moles()
to_chat(user, "<span class='notice'>Results of analysis of \icon[icon] [target].</span>")
to_chat(user, "<span class='notice'>Results of analysis of [bicon(icon)] [target].</span>")
if(total_moles>0)
to_chat(user, "<span class='notice'>Pressure: [round(pressure,0.1)] kPa</span>")
@@ -1079,18 +1079,17 @@ B --><-- A
return L
//similar function to RANGE_TURFS(), but will search spiralling outwards from the center (like the above, but only turfs)
/proc/spiral_range_turfs(dist=0, center=usr, orange=0)
/proc/spiral_range_turfs(dist=0, center=usr, orange=0, list/outlist = list(), tick_checked)
outlist.Cut()
if(!dist)
if(!orange)
return list(center)
else
return list()
outlist += center
return outlist
var/turf/t_center = get_turf(center)
if(!t_center)
return list()
return outlist
var/list/L = list()
var/list/L = outlist
var/turf/T
var/y
var/x
@@ -1128,6 +1127,8 @@ B --><-- A
if(T)
L += T
c_dist++
if(tick_checked)
CHECK_TICK
return L
@@ -1209,13 +1210,16 @@ proc/pick_closest_path(value, list/matches = get_fancy_list_of_atom_types())
#define DELTA_CALC max(((max(world.tick_usage, world.cpu) / 100) * max(Master.sleep_delta,1)), 1)
/proc/stoplag()
if (!Master || !(Master.current_runlevel & RUNLEVELS_DEFAULT))
sleep(world.tick_lag)
return 1
. = 0
var/i = 1
do
. += round(i*DELTA_CALC)
sleep(i*world.tick_lag*DELTA_CALC)
i *= 2
while (world.tick_usage > min(TICK_LIMIT_TO_RUN, GLOB.CURRENT_TICKLIMIT))
while (world.tick_usage > min(TICK_LIMIT_TO_RUN, Master.current_ticklimit))
#undef DELTA_CALC
@@ -1343,7 +1347,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
//kevinz000 if you touch this I will hunt you down
GLOBAL_VAR_INIT(valid_HTTPSGet, FALSE)
GLOBAL_PROTECT(valid_HTTPSGet)
/proc/HTTPSGet(url)
/proc/HTTPSGet(url) //tgs2 support
if(findtext(url, "\""))
GLOB.valid_HTTPSGet = FALSE
@@ -1394,9 +1398,6 @@ GLOBAL_PROTECT(valid_HTTPSGet)
#define UNTIL(X) while(!(X)) stoplag()
/proc/to_chat(target, message)
target << message
/proc/pass()
return
@@ -1416,3 +1417,10 @@ GLOBAL_PROTECT(valid_HTTPSGet)
mob_occupant = brain.brainmob
return mob_occupant
//counts the number of bits in Byond's 16-bit width field
//in constant time and memory!
/proc/BitCount(bitfield)
var/temp = bitfield - ((bitfield>>1)&46811) - ((bitfield>>2)&37449) //0133333 and 0111111 respectively
temp = ((temp + (temp>>3))&29127) % 63 //070707
return temp
code/_compile_options.dm
+4 -6
View File
@@ -35,7 +35,7 @@
//MINOR TWEAKS/MISC
#define AGE_MIN 17 //youngest a character can be
#define AGE_MAX 85 //oldest a character can be
#define WIZARD_AGE_MIN 30 //youngest a wizard can be
#define WIZARD_AGE_MIN 30 //youngest a wizard can be
#define SHOES_SLOWDOWN 0 //How much shoes slow you down by default. Negative values speed you up
#define POCKET_STRIP_DELAY 40 //time taken (in deciseconds) to search somebody's pockets
#define DOOR_CRUSH_DAMAGE 15 //the amount of damage that airlocks deal when they crush you
@@ -62,14 +62,12 @@
#endif
//Update this whenever you need to take advantage of more recent byond features
#define MIN_COMPILER_VERSION 511
#define MIN_COMPILER_VERSION 511
#if DM_VERSION < MIN_COMPILER_VERSION
//Don't forget to update this part
#error Your version of BYOND is too out-of-date to compile this project. Go to byond.com/download and update.
#error You need version 511 or higher
#error You need version 511 or higher
#endif
#ifndef SERVERTOOLS
#define SERVERTOOLS 0
#endif
#define SERVICE_CMD_PARAM_KEY "serviceCommsKey"
code/_globalvars/configuration.dm
+9 -9
View File
@@ -22,12 +22,12 @@ GLOBAL_VAR_INIT(tinted_weldhelh, TRUE)
// Debug2 is used in conjunction with a lot of admin verbs and therefore is actually legit.
GLOBAL_VAR_INIT(Debug, FALSE) // global debug switch
GLOBAL_VAR_INIT(Debug2, FALSE)
//This was a define, but I changed it to a variable so it can be changed in-game.(kept the all-caps definition because... code...) -Errorage
GLOBAL_VAR_INIT(MAX_EX_DEVESTATION_RANGE, 3)
GLOBAL_VAR_INIT(MAX_EX_HEAVY_RANGE, 7)
GLOBAL_VAR_INIT(MAX_EX_LIGHT_RANGE, 14)
GLOBAL_VAR_INIT(MAX_EX_FLASH_RANGE, 14)
GLOBAL_VAR_INIT(MAX_EX_FLAME_RANGE, 14)
GLOBAL_VAR_INIT(DYN_EX_SCALE, 0.5)
//This was a define, but I changed it to a variable so it can be changed in-game.(kept the all-caps definition because... code...) -Errorage
GLOBAL_VAR_INIT(MAX_EX_DEVESTATION_RANGE, 3)
GLOBAL_VAR_INIT(MAX_EX_HEAVY_RANGE, 7)
GLOBAL_VAR_INIT(MAX_EX_LIGHT_RANGE, 14)
GLOBAL_VAR_INIT(MAX_EX_FLASH_RANGE, 14)
GLOBAL_VAR_INIT(MAX_EX_FLAME_RANGE, 14)
GLOBAL_VAR_INIT(DYN_EX_SCALE, 0.5)
code/_globalvars/game_modes.dm
+3 -2
View File
@@ -1,4 +1,4 @@
GLOBAL_VAR_INIT(master_mode, "traitor") //"extended"
GLOBAL_VAR_INIT(master_mode, "traitor") //"extended"
GLOBAL_VAR_INIT(secret_force_mode, "secret") // if this is anything but "secret", the secret rotation will forceably choose this mode
GLOBAL_VAR_INIT(wavesecret, 0) // meteor mode, delays wave progression, terrible name
@@ -14,4 +14,5 @@ GLOBAL_VAR_INIT(cult_vote_called, FALSE)
GLOBAL_VAR_INIT(cult_mastered, FALSE)
GLOBAL_VAR_INIT(reckoning_complete, FALSE)
GLOBAL_VAR_INIT(sac_complete, FALSE)
GLOBAL_DATUM(cult_narsie, /obj/singularity/narsie/large/cult)
GLOBAL_DATUM(cult_narsie, /obj/singularity/narsie/large/cult)
GLOBAL_LIST_EMPTY(summon_spots)
code/_globalvars/lists/flavor_misc.dm
+4 -3
View File
@@ -43,12 +43,12 @@ GLOBAL_LIST_INIT(security_depts_prefs, list(SEC_DEPT_RANDOM, SEC_DEPT_NONE, SEC_
//Backpacks
#define GBACKPACK "Grey Backpack"
#define GSATCHEL "Grey Satchel"
#define GDUFFLEBAG "Grey Dufflebag"
#define Gduffelbag "Grey duffelbag"
#define LSATCHEL "Leather Satchel"
#define DBACKPACK "Department Backpack"
#define DSATCHEL "Department Satchel"
#define DDUFFLEBAG "Department Dufflebag"
GLOBAL_LIST_INIT(backbaglist, list(DBACKPACK, DSATCHEL, DDUFFLEBAG, GBACKPACK, GSATCHEL, GDUFFLEBAG, LSATCHEL))
#define Dduffelbag "Department duffelbag"
GLOBAL_LIST_INIT(backbaglist, list(DBACKPACK, DSATCHEL, Dduffelbag, GBACKPACK, GSATCHEL, Gduffelbag, LSATCHEL))
//Uplink spawn loc
#define UPLINK_PDA "PDA"
@@ -161,3 +161,4 @@ GLOBAL_LIST_INIT(numbers_as_words, list("One", "Two", "Three", "Four",
return L
GLOBAL_LIST_INIT(station_numerals, greek_letters + phonetic_alphabet + numbers_as_words + generate_number_strings())
GLOBAL_LIST_INIT(admiral_messages, list("Do you know how expensive these stations are?","Stop wasting my time.","I was sleeping, thanks a lot.","Stand and fight you cowards!","You knew the risks coming in.","Stop being paranoid.","Whatever's broken just build a new one.","No.", "<i>null</i>","<i>Error: No comment given.</i>", "It's a good day to die!"))
code/_globalvars/lists/mapping.dm
-2
View File
@@ -32,7 +32,6 @@ GLOBAL_LIST_EMPTY(generic_event_spawns) //list of all spawns for events
GLOBAL_LIST_EMPTY(wizardstart)
GLOBAL_LIST_EMPTY(newplayer_start)
GLOBAL_LIST_EMPTY(latejoin)
GLOBAL_LIST_EMPTY(prisonwarp) //prisoners go to these
GLOBAL_LIST_EMPTY(holdingfacility) //captured people go here
GLOBAL_LIST_EMPTY(xeno_spawn)//Aliens spawn at these.
@@ -53,5 +52,4 @@ GLOBAL_LIST_EMPTY(awaydestinations) //a list of landmarks that the warpgate can
//used by jump-to-area etc. Updated by area/updateName()
GLOBAL_LIST_EMPTY(sortedAreas)
GLOBAL_LIST_EMPTY(transit_markers)
GLOBAL_LIST_EMPTY(all_abstract_markers)
code/_globalvars/lists/medals.dm
Executable
+1
View File
@@ -0,0 +1 @@
GLOBAL_LIST_EMPTY(commendations)
code/_globalvars/lists/objects.dm
+3 -1
View File
@@ -32,4 +32,6 @@ GLOBAL_LIST_EMPTY(ladders)
GLOBAL_LIST_EMPTY(trophy_cases)
GLOBAL_LIST_EMPTY(wire_color_directory)
GLOBAL_LIST_EMPTY(wire_name_directory)
GLOBAL_LIST_EMPTY(wire_name_directory)
GLOBAL_LIST_EMPTY(ai_status_displays)
code/_globalvars/logging.dm
+2
View File
@@ -31,4 +31,6 @@ GLOBAL_PROTECT(OOClog)
GLOBAL_LIST_EMPTY(adminlog)
GLOBAL_PROTECT(adminlog)
GLOBAL_LIST_EMPTY(individual_log_list) // Logs each mob individual logs, a global so it doesn't get lost on cloning/changing mobs
GLOBAL_LIST_EMPTY(active_turfs_startlist)
code/_globalvars/misc.dm
+1 -1
View File
@@ -8,7 +8,7 @@ GLOBAL_VAR_INIT(fileaccess_timer, 0)
GLOBAL_VAR_INIT(TAB, "&nbsp;&nbsp;&nbsp;&nbsp;")
GLOBAL_DATUM(data_core, /datum/datacore)
GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
GLOBAL_VAR_INIT(CELLRATE, 0.002) // multiplier for watts per tick <> cell storage (eg: .002 means if there is a load of 1000 watts, 20 units will be taken from a cell per second)
GLOBAL_VAR_INIT(CHARGELEVEL, 0.001) // Cap for how fast cells charge, as a percentage-per-tick (.001 means cellcharge is capped to 1% per second)
code/_globalvars/sensitive.dm
+1 -1
View File
@@ -13,4 +13,4 @@ GLOBAL_REAL_VAR(sqlport) = "3306"
GLOBAL_REAL_VAR(sqlfdbkdb) = "test"
GLOBAL_REAL_VAR(sqlfdbklogin) = "root"
GLOBAL_REAL_VAR(sqlfdbkpass) = ""
GLOBAL_REAL_VAR(sqlfdbktableprefix) = "erro_"
GLOBAL_REAL_VAR(sqlfdbktableprefix) = ""
code/_globalvars/tooltips.dm
Executable
+1
View File
@@ -0,0 +1 @@
GLOBAL_VAR_INIT(enable_examine_tips, TRUE)
code/_onclick/autoclick.dm
+49 -2
View File
@@ -1,5 +1,10 @@
/client
var/list/atom/selected_target[2]
var/obj/item/active_mousedown_item = null
var/mouseParams = ""
var/mouseLocation = null
var/mouseObject = null
var/mouseControlObject = null
/client/MouseDown(object, location, control, params)
var/delay = mob.CanMobAutoclick(object, location, params)
@@ -9,14 +14,26 @@
while(selected_target[1])
Click(selected_target[1], location, control, selected_target[2])
sleep(delay)
active_mousedown_item = mob.canMobMousedown(object, location, params)
if(active_mousedown_item)
active_mousedown_item.onMouseDown(object, location, params, mob)
/client/MouseUp(object, location, control, params)
selected_target[1] = null
if(active_mousedown_item)
active_mousedown_item.onMouseUp(object, location, params, mob)
active_mousedown_item = null
/client/MouseDrag(src_object,atom/over_object,src_location,over_location,src_control,over_control,params)
if(selected_target[1] && over_object.IsAutoclickable())
mouseParams = params
mouseLocation = over_location
mouseObject = over_object
mouseControlObject = over_control
if(selected_target[1] && over_object && over_object.IsAutoclickable())
selected_target[1] = over_object
selected_target[2] = params
if(active_mousedown_item)
active_mousedown_item.onMouseDrag(src_object, over_object, src_location, over_location, params, mob)
/mob/proc/CanMobAutoclick(object, location, params)
@@ -27,8 +44,31 @@
if(h)
. = h.CanItemAutoclick(object, location, params)
/mob/proc/canMobMousedown(object, location, params)
/mob/living/carbon/canMobMousedown(atom/object, location, params)
var/obj/item/H = get_active_held_item()
if(H)
. = H.canItemMouseDown(object, location, params)
/obj/item/proc/CanItemAutoclick(object, location, params)
/obj/item/proc/canItemMouseDown(object, location, params)
if(canMouseDown)
return src
/obj/item/proc/onMouseDown(object, location, params, mob)
return
/obj/item/proc/onMouseUp(object, location, params, mob)
return
/obj/item/proc/onMouseDrag(src_object, over_object, src_location, over_location, params, mob)
return
/obj/item
var/canMouseDown = FALSE
/obj/item/weapon/gun
var/automatic = 0 //can gun use it, 0 is no, anything above 0 is the delay between clicks in ds
@@ -42,4 +82,11 @@
. = 0
/obj/screen/click_catcher/IsAutoclickable()
. = 1
. = 1
//Please don't roast me too hard
/client/MouseMove(object,location,control,params)
mouseParams = params
mouseLocation = location
mouseObject = object
mouseControlObject = control
code/_onclick/click.dm
+448 -447
View File
@@ -1,149 +1,149 @@
/*
Click code cleanup
~Sayu
*/
// 1 decisecond click delay (above and beyond mob/next_move)
//This is mainly modified by click code, to modify click delays elsewhere, use next_move and changeNext_move()
/mob/var/next_click = 0
// THESE DO NOT EFFECT THE BASE 1 DECISECOND DELAY OF NEXT_CLICK
/mob/var/next_move_adjust = 0 //Amount to adjust action/click delays by, + or -
/mob/var/next_move_modifier = 1 //Value to multiply action/click delays by
//Delays the mob's next click/action by num deciseconds
// eg: 10-3 = 7 deciseconds of delay
// eg: 10*0.5 = 5 deciseconds of delay
// DOES NOT EFFECT THE BASE 1 DECISECOND DELAY OF NEXT_CLICK
/mob/proc/changeNext_move(num)
next_move = world.time + ((num+next_move_adjust)*next_move_modifier)
/*
Before anything else, defer these calls to a per-mobtype handler. This allows us to
remove istype() spaghetti code, but requires the addition of other handler procs to simplify it.
Alternately, you could hardcode every mob's variation in a flat ClickOn() proc; however,
that's a lot of code duplication and is hard to maintain.
Note that this proc can be overridden, and is in the case of screen objects.
*/
/atom/Click(location,control,params)
if(initialized)
usr.ClickOn(src, params)
/atom/DblClick(location,control,params)
if(initialized)
usr.DblClickOn(src,params)
/atom/MouseWheel(delta_x,delta_y,location,control,params)
if(initialized)
usr.MouseWheelOn(src, delta_x, delta_y, params)
/*
Standard mob ClickOn()
Handles exceptions: Buildmode, middle click, modified clicks, mech actions
After that, mostly just check your state, check whether you're holding an item,
check whether you're adjacent to the target, then pass off the click to whoever
is recieving it.
The most common are:
* mob/UnarmedAttack(atom,adjacent) - used here only when adjacent, with no item in hand; in the case of humans, checks gloves
* atom/attackby(item,user) - used only when adjacent
* item/afterattack(atom,user,adjacent,params) - used both ranged and adjacent
* mob/RangedAttack(atom,params) - used only ranged, only used for tk and laser eyes but could be changed
*/
/mob/proc/ClickOn( atom/A, params )
if(world.time <= next_click)
return
next_click = world.time + 1
if(client && client.click_intercept)
if(call(client.click_intercept, "InterceptClickOn")(src, params, A))
return
var/list/modifiers = params2list(params)
if(modifiers["shift"] && modifiers["middle"])
ShiftMiddleClickOn(A)
return
if(modifiers["shift"] && modifiers["ctrl"])
CtrlShiftClickOn(A)
return
if(modifiers["middle"])
MiddleClickOn(A)
return
if(modifiers["shift"])
ShiftClickOn(A)
return
if(modifiers["alt"]) // alt and alt-gr (rightalt)
AltClickOn(A)
return
if(modifiers["ctrl"])
CtrlClickOn(A)
return
if(incapacitated(ignore_restraints = 1))
return
face_atom(A)
if(next_move > world.time) // in the year 2000...
return
if(A.IsObscured())
/*
Click code cleanup
~Sayu
*/
// 1 decisecond click delay (above and beyond mob/next_move)
//This is mainly modified by click code, to modify click delays elsewhere, use next_move and changeNext_move()
/mob/var/next_click = 0
// THESE DO NOT EFFECT THE BASE 1 DECISECOND DELAY OF NEXT_CLICK
/mob/var/next_move_adjust = 0 //Amount to adjust action/click delays by, + or -
/mob/var/next_move_modifier = 1 //Value to multiply action/click delays by
//Delays the mob's next click/action by num deciseconds
// eg: 10-3 = 7 deciseconds of delay
// eg: 10*0.5 = 5 deciseconds of delay
// DOES NOT EFFECT THE BASE 1 DECISECOND DELAY OF NEXT_CLICK
/mob/proc/changeNext_move(num)
next_move = world.time + ((num+next_move_adjust)*next_move_modifier)
/*
Before anything else, defer these calls to a per-mobtype handler. This allows us to
remove istype() spaghetti code, but requires the addition of other handler procs to simplify it.
Alternately, you could hardcode every mob's variation in a flat ClickOn() proc; however,
that's a lot of code duplication and is hard to maintain.
Note that this proc can be overridden, and is in the case of screen objects.
*/
/atom/Click(location,control,params)
if(initialized)
usr.ClickOn(src, params)
/atom/DblClick(location,control,params)
if(initialized)
usr.DblClickOn(src,params)
/atom/MouseWheel(delta_x,delta_y,location,control,params)
if(initialized)
usr.MouseWheelOn(src, delta_x, delta_y, params)
/*
Standard mob ClickOn()
Handles exceptions: Buildmode, middle click, modified clicks, mech actions
After that, mostly just check your state, check whether you're holding an item,
check whether you're adjacent to the target, then pass off the click to whoever
is recieving it.
The most common are:
* mob/UnarmedAttack(atom,adjacent) - used here only when adjacent, with no item in hand; in the case of humans, checks gloves
* atom/attackby(item,user) - used only when adjacent
* item/afterattack(atom,user,adjacent,params) - used both ranged and adjacent
* mob/RangedAttack(atom,params) - used only ranged, only used for tk and laser eyes but could be changed
*/
/mob/proc/ClickOn( atom/A, params )
if(world.time <= next_click)
return
next_click = world.time + 1
if(client && client.click_intercept)
if(call(client.click_intercept, "InterceptClickOn")(src, params, A))
return
var/list/modifiers = params2list(params)
if(modifiers["shift"] && modifiers["middle"])
ShiftMiddleClickOn(A)
return
if(modifiers["shift"] && modifiers["ctrl"])
CtrlShiftClickOn(A)
return
if(modifiers["middle"])
MiddleClickOn(A)
return
if(modifiers["shift"])
ShiftClickOn(A)
return
if(modifiers["alt"]) // alt and alt-gr (rightalt)
AltClickOn(A)
return
if(modifiers["ctrl"])
CtrlClickOn(A)
return
if(istype(loc,/obj/mecha))
var/obj/mecha/M = loc
return M.click_action(A,src,params)
if(restrained())
changeNext_move(CLICK_CD_HANDCUFFED) //Doing shit in cuffs shall be vey slow
RestrainedClickOn(A)
return
if(in_throw_mode)
throw_item(A)
return
var/obj/item/W = get_active_held_item()
if(W == A)
W.attack_self(src)
update_inv_hands()
return
//These are always reachable.
//User itself, current loc, and user inventory
if(DirectAccess(A))
if(W)
melee_item_attack_chain(src,W,A,params)
else
if(ismob(A))
changeNext_move(CLICK_CD_MELEE)
UnarmedAttack(A)
return
//Can't reach anything else in lockers or other weirdness
if(!loc.AllowClick())
return
//Standard reach turf to turf or reaching inside storage
if(CanReach(A,W))
if(W)
melee_item_attack_chain(src,W,A,params)
else
if(ismob(A))
changeNext_move(CLICK_CD_MELEE)
UnarmedAttack(A,1)
else
if(W)
W.afterattack(A,src,0,params)
else
RangedAttack(A,params)
if(incapacitated(ignore_restraints = 1))
return
face_atom(A)
if(next_move > world.time) // in the year 2000...
return
if(!modifiers["catcher"] && A.IsObscured())
return
if(istype(loc,/obj/mecha))
var/obj/mecha/M = loc
return M.click_action(A,src,params)
if(restrained())
changeNext_move(CLICK_CD_HANDCUFFED) //Doing shit in cuffs shall be vey slow
RestrainedClickOn(A)
return
if(in_throw_mode)
throw_item(A)
return
var/obj/item/W = get_active_held_item()
if(W == A)
W.attack_self(src)
update_inv_hands()
return
//These are always reachable.
//User itself, current loc, and user inventory
if(DirectAccess(A))
if(W)
W.melee_attack_chain(src, A, params)
else
if(ismob(A))
changeNext_move(CLICK_CD_MELEE)
UnarmedAttack(A)
return
//Can't reach anything else in lockers or other weirdness
if(!loc.AllowClick())
return
//Standard reach turf to turf or reaching inside storage
if(CanReach(A,W))
if(W)
W.melee_attack_chain(src, A, params)
else
if(ismob(A))
changeNext_move(CLICK_CD_MELEE)
UnarmedAttack(A,1)
else
if(W)
W.afterattack(A,src,0,params)
else
RangedAttack(A,params)
//Is the atom obscured by a PREVENT_CLICK_UNDER object above it
/atom/proc/IsObscured()
if(!isturf(loc)) //This only makes sense for things directly on turfs for now
@@ -162,306 +162,307 @@
return TRUE
return FALSE
/atom/movable/proc/CanReach(atom/target,obj/item/tool,view_only = FALSE)
if(isturf(target) || isturf(target.loc) || DirectAccess(target)) //Directly accessible atoms
if(Adjacent(target) || (tool && CheckToolReach(src, target, tool.reach))) //Adjacent or reaching attacks
return TRUE
else
//Things inside storage insde another storage
//Eg Contents of a box in a backpack
var/atom/outer_storage = get_atom_on_turf(target)
if(outer_storage == target) //whatever that is we don't want infinite loop.
return FALSE
if(outer_storage && CanReach(outer_storage,tool) && outer_storage.CanReachStorage(target,src,view_only ? STORAGE_VIEW_DEPTH : INVENTORY_DEPTH))
return TRUE
return FALSE
//Can [target] in this container be reached by [user], can't be more than [depth] levels deep
/atom/proc/CanReachStorage(atom/target,user,depth)
return FALSE
/obj/item/weapon/storage/CanReachStorage(atom/target,user,depth)
while(target && depth > 0)
target = target.loc
depth--
if(target == src)
return TRUE
return FALSE
/atom/movable/proc/DirectAccess(atom/target)
if(target == src)
return TRUE
if(target == loc)
return TRUE
/mob/DirectAccess(atom/target)
if(..())
return TRUE
if(target in contents) //This could probably use moving down and restricting to inventory only
return TRUE
return FALSE
/mob/living/DirectAccess(atom/target)
if(..()) //Lightweight checks first
return TRUE
if(target in GetAllContents())
return TRUE
/atom/proc/AllowClick()
return FALSE
/turf/AllowClick()
return TRUE
/proc/CheckToolReach(atom/movable/here, atom/movable/there, reach)
if(!here || !there)
return
switch(reach)
if(0)
return FALSE
if(1)
return FALSE //here.Adjacent(there)
if(2 to INFINITY)
var/obj/dummy = new(get_turf(here))
dummy.pass_flags |= PASSTABLE
dummy.invisibility = INVISIBILITY_ABSTRACT
for(var/i in 1 to reach) //Limit it to that many tries
var/turf/T = get_step(dummy, get_dir(dummy, there))
if(dummy.CanReach(there))
qdel(dummy)
return TRUE
if(!dummy.Move(T)) //we're blocked!
qdel(dummy)
return
qdel(dummy)
// Default behavior: ignore double clicks (the second click that makes the doubleclick call already calls for a normal click)
/mob/proc/DblClickOn(atom/A, params)
return
/*
Translates into attack_hand, etc.
Note: proximity_flag here is used to distinguish between normal usage (flag=1),
and usage when clicking on things telekinetically (flag=0). This proc will
not be called at ranged except with telekinesis.
proximity_flag is not currently passed to attack_hand, and is instead used
in human click code to allow glove touches only at melee range.
*/
/mob/proc/UnarmedAttack(atom/A, proximity_flag)
if(ismob(A))
changeNext_move(CLICK_CD_MELEE)
return
/*
Ranged unarmed attack:
This currently is just a default for all mobs, involving
laser eyes and telekinesis. You could easily add exceptions
for things like ranged glove touches, spitting alien acid/neurotoxin,
animals lunging, etc.
*/
/mob/proc/RangedAttack(atom/A, params)
/*
Restrained ClickOn
Used when you are handcuffed and click things.
Not currently used by anything but could easily be.
*/
/mob/proc/RestrainedClickOn(atom/A)
return
/*
Middle click
Only used for swapping hands
*/
/mob/proc/MiddleClickOn(atom/A)
return
/mob/living/carbon/MiddleClickOn(atom/A)
if(!src.stat && src.mind && src.mind.changeling && src.mind.changeling.chosen_sting && (istype(A, /mob/living/carbon)) && (A != src))
next_click = world.time + 5
mind.changeling.chosen_sting.try_to_sting(src, A)
else
swap_hand()
/mob/living/simple_animal/drone/MiddleClickOn(atom/A)
swap_hand()
// In case of use break glass
/*
/atom/proc/MiddleClick(mob/M as mob)
return
*/
/*
Shift click
For most mobs, examine.
This is overridden in ai.dm
*/
/mob/proc/ShiftClickOn(atom/A)
A.ShiftClick(src)
return
/atom/proc/ShiftClick(mob/user)
if(user.client && user.client.eye == user || user.client.eye == user.loc)
user.examinate(src)
return
/*
Ctrl click
For most objects, pull
*/
/mob/proc/CtrlClickOn(atom/A)
A.CtrlClick(src)
return
/atom/proc/CtrlClick(mob/user)
var/mob/living/ML = user
if(istype(ML))
ML.pulled(src)
/mob/living/carbon/human/CtrlClick(mob/user)
if(ishuman(user) && Adjacent(user))
var/mob/living/carbon/human/H = user
H.dna.species.grab(H, src, H.martial_art)
H.next_click = world.time + CLICK_CD_MELEE
else
..()
/*
Alt click
Unused except for AI
*/
/mob/proc/AltClickOn(atom/A)
A.AltClick(src)
return
/mob/living/carbon/AltClickOn(atom/A)
if(!src.stat && src.mind && src.mind.changeling && src.mind.changeling.chosen_sting && (istype(A, /mob/living/carbon)) && (A != src))
next_click = world.time + 5
mind.changeling.chosen_sting.try_to_sting(src, A)
else
..()
/atom/proc/AltClick(mob/user)
var/turf/T = get_turf(src)
if(T && user.TurfAdjacent(T))
if(user.listed_turf == T)
user.listed_turf = null
else
user.listed_turf = T
user.client.statpanel = T.name
return
/mob/proc/TurfAdjacent(turf/T)
return T.Adjacent(src)
/*
Control+Shift click
Unused except for AI
*/
/mob/proc/CtrlShiftClickOn(atom/A)
A.CtrlShiftClick(src)
return
/mob/proc/ShiftMiddleClickOn(atom/A)
src.pointed(A)
return
/atom/proc/CtrlShiftClick(mob/user)
return
/*
Misc helpers
Laser Eyes: as the name implies, handles this since nothing else does currently
face_atom: turns the mob towards what you clicked on
*/
/mob/proc/LaserEyes(atom/A)
return
/mob/living/LaserEyes(atom/A)
changeNext_move(CLICK_CD_RANGE)
var/turf/T = get_turf(src)
var/turf/U = get_turf(A)
var/obj/item/projectile/beam/LE = new /obj/item/projectile/beam( loc )
LE.icon = 'icons/effects/genetics.dmi'
LE.icon_state = "eyelasers"
playsound(usr.loc, 'sound/weapons/taser2.ogg', 75, 1)
LE.firer = src
LE.def_zone = get_organ_target()
LE.original = A
LE.current = T
LE.yo = U.y - T.y
LE.xo = U.x - T.x
LE.fire()
// Simple helper to face what you clicked on, in case it should be needed in more than one place
/mob/proc/face_atom(atom/A)
if( buckled || stat != CONSCIOUS || !A || !x || !y || !A.x || !A.y )
return
var/dx = A.x - x
var/dy = A.y - y
if(!dx && !dy) // Wall items are graphically shifted but on the floor
if(A.pixel_y > 16)
setDir(NORTH)
else if(A.pixel_y < -16)
setDir(SOUTH)
else if(A.pixel_x > 16)
setDir(EAST)
else if(A.pixel_x < -16)
setDir(WEST)
return
if(abs(dx) < abs(dy))
if(dy > 0)
setDir(NORTH)
else
setDir(SOUTH)
else
if(dx > 0)
setDir(EAST)
else
setDir(WEST)
/obj/screen/click_catcher
icon = 'icons/mob/screen_gen.dmi'
icon_state = "click_catcher"
plane = CLICKCATCHER_PLANE
mouse_opacity = 2
screen_loc = "CENTER"
/obj/screen/click_catcher/New()
..()
transform = matrix(200, 0, 0, 0, 200, 0)
/obj/screen/click_catcher/Click(location, control, params)
var/list/modifiers = params2list(params)
if(modifiers["middle"] && istype(usr, /mob/living/carbon))
var/mob/living/carbon/C = usr
C.swap_hand()
else
var/turf/T = params2turf(modifiers["screen-loc"], get_turf(usr))
if(T)
T.Click(location, control, params)
. = 1
/* MouseWheelOn */
/mob/proc/MouseWheelOn(atom/A, delta_x, delta_y, params)
return
/mob/dead/observer/MouseWheelOn(atom/A, delta_x, delta_y, params)
var/list/modifier = params2list(params)
if(modifier["shift"])
var/view = 0
if(delta_y > 0)
view = -1
else
view = 1
add_view_range(view)
/atom/movable/proc/CanReach(atom/target,obj/item/tool,view_only = FALSE)
if(isturf(target) || isturf(target.loc) || DirectAccess(target)) //Directly accessible atoms
if(Adjacent(target) || (tool && CheckToolReach(src, target, tool.reach))) //Adjacent or reaching attacks
return TRUE
else
//Things inside storage insde another storage
//Eg Contents of a box in a backpack
var/atom/outer_storage = get_atom_on_turf(target)
if(outer_storage == target) //whatever that is we don't want infinite loop.
return FALSE
if(outer_storage && CanReach(outer_storage,tool) && outer_storage.CanReachStorage(target,src,view_only ? STORAGE_VIEW_DEPTH : INVENTORY_DEPTH))
return TRUE
return FALSE
//Can [target] in this container be reached by [user], can't be more than [depth] levels deep
/atom/proc/CanReachStorage(atom/target,user,depth)
return FALSE
/obj/item/weapon/storage/CanReachStorage(atom/target,user,depth)
while(target && depth > 0)
target = target.loc
depth--
if(target == src)
return TRUE
return FALSE
/atom/movable/proc/DirectAccess(atom/target)
if(target == src)
return TRUE
if(target == loc)
return TRUE
/mob/DirectAccess(atom/target)
if(..())
return TRUE
if(target in contents) //This could probably use moving down and restricting to inventory only
return TRUE
return FALSE
/mob/living/DirectAccess(atom/target)
if(..()) //Lightweight checks first
return TRUE
if(target in GetAllContents())
return TRUE
/atom/proc/AllowClick()
return FALSE
/turf/AllowClick()
return TRUE
/proc/CheckToolReach(atom/movable/here, atom/movable/there, reach)
if(!here || !there)
return
switch(reach)
if(0)
return FALSE
if(1)
return FALSE //here.Adjacent(there)
if(2 to INFINITY)
var/obj/dummy = new(get_turf(here))
dummy.pass_flags |= PASSTABLE
dummy.invisibility = INVISIBILITY_ABSTRACT
for(var/i in 1 to reach) //Limit it to that many tries
var/turf/T = get_step(dummy, get_dir(dummy, there))
if(dummy.CanReach(there))
qdel(dummy)
return TRUE
if(!dummy.Move(T)) //we're blocked!
qdel(dummy)
return
qdel(dummy)
// Default behavior: ignore double clicks (the second click that makes the doubleclick call already calls for a normal click)
/mob/proc/DblClickOn(atom/A, params)
return
/*
Translates into attack_hand, etc.
Note: proximity_flag here is used to distinguish between normal usage (flag=1),
and usage when clicking on things telekinetically (flag=0). This proc will
not be called at ranged except with telekinesis.
proximity_flag is not currently passed to attack_hand, and is instead used
in human click code to allow glove touches only at melee range.
*/
/mob/proc/UnarmedAttack(atom/A, proximity_flag)
if(ismob(A))
changeNext_move(CLICK_CD_MELEE)
return
/*
Ranged unarmed attack:
This currently is just a default for all mobs, involving
laser eyes and telekinesis. You could easily add exceptions
for things like ranged glove touches, spitting alien acid/neurotoxin,
animals lunging, etc.
*/
/mob/proc/RangedAttack(atom/A, params)
/*
Restrained ClickOn
Used when you are handcuffed and click things.
Not currently used by anything but could easily be.
*/
/mob/proc/RestrainedClickOn(atom/A)
return
/*
Middle click
Only used for swapping hands
*/
/mob/proc/MiddleClickOn(atom/A)
return
/mob/living/carbon/MiddleClickOn(atom/A)
if(!src.stat && src.mind && src.mind.changeling && src.mind.changeling.chosen_sting && (istype(A, /mob/living/carbon)) && (A != src))
next_click = world.time + 5
mind.changeling.chosen_sting.try_to_sting(src, A)
else
swap_hand()
/mob/living/simple_animal/drone/MiddleClickOn(atom/A)
swap_hand()
// In case of use break glass
/*
/atom/proc/MiddleClick(mob/M as mob)
return
*/
/*
Shift click
For most mobs, examine.
This is overridden in ai.dm
*/
/mob/proc/ShiftClickOn(atom/A)
A.ShiftClick(src)
return
/atom/proc/ShiftClick(mob/user)
if(user.client && user.client.eye == user || user.client.eye == user.loc)
user.examinate(src)
return
/*
Ctrl click
For most objects, pull
*/
/mob/proc/CtrlClickOn(atom/A)
A.CtrlClick(src)
return
/atom/proc/CtrlClick(mob/user)
var/mob/living/ML = user
if(istype(ML))
ML.pulled(src)
/mob/living/carbon/human/CtrlClick(mob/user)
if(ishuman(user) && Adjacent(user))
var/mob/living/carbon/human/H = user
H.dna.species.grab(H, src, H.mind.martial_art)
H.changeNext_move(CLICK_CD_MELEE)
else
..()
/*
Alt click
Unused except for AI
*/
/mob/proc/AltClickOn(atom/A)
A.AltClick(src)
return
/mob/living/carbon/AltClickOn(atom/A)
if(!src.stat && src.mind && src.mind.changeling && src.mind.changeling.chosen_sting && (istype(A, /mob/living/carbon)) && (A != src))
next_click = world.time + 5
mind.changeling.chosen_sting.try_to_sting(src, A)
else
..()
/atom/proc/AltClick(mob/user)
var/turf/T = get_turf(src)
if(T && user.TurfAdjacent(T))
if(user.listed_turf == T)
user.listed_turf = null
else
user.listed_turf = T
user.client.statpanel = T.name
return
/mob/proc/TurfAdjacent(turf/T)
return T.Adjacent(src)
/*
Control+Shift click
Unused except for AI
*/
/mob/proc/CtrlShiftClickOn(atom/A)
A.CtrlShiftClick(src)
return
/mob/proc/ShiftMiddleClickOn(atom/A)
src.pointed(A)
return
/atom/proc/CtrlShiftClick(mob/user)
return
/*
Misc helpers
Laser Eyes: as the name implies, handles this since nothing else does currently
face_atom: turns the mob towards what you clicked on
*/
/mob/proc/LaserEyes(atom/A)
return
/mob/living/LaserEyes(atom/A)
changeNext_move(CLICK_CD_RANGE)
var/turf/T = get_turf(src)
var/turf/U = get_turf(A)
var/obj/item/projectile/beam/LE = new /obj/item/projectile/beam( loc )
LE.icon = 'icons/effects/genetics.dmi'
LE.icon_state = "eyelasers"
playsound(usr.loc, 'sound/weapons/taser2.ogg', 75, 1)
LE.firer = src
LE.def_zone = get_organ_target()
LE.original = A
LE.current = T
LE.yo = U.y - T.y
LE.xo = U.x - T.x
LE.fire()
// Simple helper to face what you clicked on, in case it should be needed in more than one place
/mob/proc/face_atom(atom/A)
if( buckled || stat != CONSCIOUS || !A || !x || !y || !A.x || !A.y )
return
var/dx = A.x - x
var/dy = A.y - y
if(!dx && !dy) // Wall items are graphically shifted but on the floor
if(A.pixel_y > 16)
setDir(NORTH)
else if(A.pixel_y < -16)
setDir(SOUTH)
else if(A.pixel_x > 16)
setDir(EAST)
else if(A.pixel_x < -16)
setDir(WEST)
return
if(abs(dx) < abs(dy))
if(dy > 0)
setDir(NORTH)
else
setDir(SOUTH)
else
if(dx > 0)
setDir(EAST)
else
setDir(WEST)
/obj/screen/click_catcher
icon = 'icons/mob/screen_gen.dmi'
icon_state = "click_catcher"
plane = CLICKCATCHER_PLANE
mouse_opacity = 2
screen_loc = "CENTER"
/obj/screen/click_catcher/New()
..()
transform = matrix(200, 0, 0, 0, 200, 0)
/obj/screen/click_catcher/Click(location, control, params)
var/list/modifiers = params2list(params)
if(modifiers["middle"] && istype(usr, /mob/living/carbon))
var/mob/living/carbon/C = usr
C.swap_hand()
else
var/turf/T = params2turf(modifiers["screen-loc"], get_turf(usr))
params += "&catcher=1"
if(T)
T.Click(location, control, params)
. = 1
/* MouseWheelOn */
/mob/proc/MouseWheelOn(atom/A, delta_x, delta_y, params)
return
/mob/dead/observer/MouseWheelOn(atom/A, delta_x, delta_y, params)
var/list/modifier = params2list(params)
if(modifier["shift"])
var/view = 0
if(delta_y > 0)
view = -1
else
view = 1
add_view_range(view)
code/_onclick/cyborg.dm
+2 -2
View File
@@ -71,7 +71,7 @@
// cyborgs are prohibited from using storage items so we can I think safely remove (A.loc in contents)
if(A == loc || (A in loc) || (A in contents))
melee_item_attack_chain(src, W, A, params)
W.melee_attack_chain(src, A, params)
return
if(!isturf(loc))
@@ -80,7 +80,7 @@
// cyborgs are prohibited from using storage items so we can I think safely remove (A.loc && isturf(A.loc.loc))
if(isturf(A) || isturf(A.loc))
if(A.Adjacent(src)) // see adjacent.dm
melee_item_attack_chain(src, W, A, params)
W.melee_attack_chain(src, A, params)
return
else
W.afterattack(A, src, 0, params)

Some files were not shown because too many files have changed in this diff Show More