Commit Graph
150 Commits
Author SHA1 Message Date
YakumoChenandGitHub 1e34e3d081 Add files via upload 2020-03-01 05:19:27 -05:00
YakumoChenandGitHub cc2e0a6440 makes mining base less ugly 2020-03-01 03:45:03 -05:00
r4d6 f76a1c15f3 Port random mining base 2020-02-24 13:27:54 -05:00
Ghommie 8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Hatterhat aedd8b87f6 maybe giving them an active gps is a bad idea 2020-02-16 02:33:14 -06:00
Hatterhat 7ef8b36324 golems have gpses now 2020-02-04 18:45:31 -06:00
Ghommie 55fa48737e Forgot about not versioned files. 2020-02-02 01:28:16 +01:00
Ghommie c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
Ghommie 7837688426 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-28 23:41:10 +01:00
Ghommie 9db79ff958 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-20 23:40:21 +01:00
Useroth 5e836c51e4 Forgot to track the new files 2019-12-08 14:05:05 +01:00
Ghommie 6484eea339 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-15 00:36:50 +01:00
Ghommie 19a511929d and "Replaces the slime extract in the clown biodome with a superlube sprayer." 2019-11-11 23:39:03 +01:00
Ghommie e50c56150e ports "Adds superlube to the clown ruin" and buffs clown PDAs 2019-11-11 23:10:22 +01:00
Ghommie 09860d463f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-10 23:23:36 +01:00
Ghommie f6feeb93ea Mapping in arcade dirs. 2019-10-30 16:47:44 +01:00
Ghommie 5fcf5b1c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-10-29 13:38:16 +01:00
Ghommie 2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
TrilbyspacecloneandGitHub 841f9ae878 Update lavaland_surface_ash_walker1.dmm 2019-10-24 10:05:26 -04:00
Poojawa 53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
Sishen 3281f23eb6 made changes as per bhijns request 2019-08-14 16:30:54 -04:00
Sishen 0693f27010 Update lavaland_surface_ash_walker1.dmm 2019-08-09 03:43:55 -04:00
Poojawa dcbcf704da I accidentally all the maps. whoops 2019-08-04 06:27:28 -05:00
Poojawa 3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Ghommie 589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
Trilbyspacecloneandkevinz000 51e4ac0f67 fixes plant disk design and hacked autolathen (#8674)
* fixes plant disk design and hacked autolathen

* Update lavaland_surface_seed_vault.dmm
2019-06-23 05:59:19 -07:00
deathride58andGitHub 88a8db87c2 Merge pull request #8612 from BlackMajor/Ooga
Makes a small adjustment to the ash walker camp.
2019-06-15 21:29:55 -04:00
BlackMajor e90fe8faf1 Update lavaland_surface_ash_walker1.dmm 2019-06-10 23:50:09 +12:00
BlackMajor 7523c86071 Wasn't I supposed to do this in January 2019-06-10 22:55:38 +12:00
TrilbyspacecloneandGitHub a68c40a1a0 Update lavaland_surface_seed_vault.dmm 2019-05-20 15:29:52 -04:00
TrilbyspacecloneandGitHub 9ff2132055 Update lavaland_surface_seed_vault.dmm 2019-05-18 12:52:59 -04:00
Poojawa 45e912cc6c map editing is nicer with notepad ++ at least 2019-05-14 03:30:00 -05:00
Poojawa 0f02562b51 Fixes Xenomorph blood related travis errors 2019-05-09 09:59:34 -05:00
Poojawa 29f4dfca83 Maps batch fixed 2019-04-13 23:30:22 -05:00
Poojawa e170f8523d Let's make sure the lava is also the same airmix too 2019-04-02 05:56:48 -05:00
Poojawa fc4659f503 Fixes deadly nest area 2019-04-02 05:45:12 -05:00
Tupinambisandkevinz000 58347dad9b Stop self antagging you shits (#7878) 2019-01-03 04:34:55 -08:00
Tupinambis 828b631570 Increased Ash Walker resistances, makes them ash proof. Improves the Base. 2018-12-15 15:33:19 -06:00
Poojawa 01a7624ec2 fixes mam tail wag
fixes digi leg spawning
fixes ash drake range nomming
fixes spawner in alien nest
2018-09-20 01:56:46 -05:00
Poojawa 42db44b39e Alien Ruin fix, various cherrypicked upstream fixes
Also adds new buildmode
2018-09-13 22:55:11 -05:00
Poojawa df7e625adb One day, while Bhjin was being lazy... 2018-09-11 13:03:53 -05:00
Poojawa fa70720cc1 Map Conversions 2018-09-11 08:58:34 -05:00
Tupinambisandkevinz000 02a86dd2a0 New Alien Lavaland Ruin (#7455)
* Removes the old "xeno nest" lavaland ruin that currently is blacklisted on the live server, and replaces it with a new "alien nest" ruin.

* Tiny ruin description change.

* Removed all organs scattered around the nest, and replaced them with corpses you must harvest the organs from. Also slightly changes the loot and the locations of said loot.

Drone and Queen corpse spawners have been added.

* Removed xenomorph queen corpse, moved drone corpse into a location that is harder to cheese. Added "Hive's Blessing" (Syringe containing alien microbes.)
2018-08-23 00:26:32 -07:00
kevinz000 4ff02b5a8b Sliding Puzzle 2018-08-07 04:44:12 -07:00
deathride58 db2a15d42d maps, tools, goon folder, icons, sounds, and strings. everything except code 2018-07-01 23:54:31 -04:00
LetterJayandGitHub 6d74717b39 Merge pull request #7158 from Citadel-Station-13/upstream-merge-38533
[MIRROR] Adds dance machine, drink dispensers, flavor to beach bum ruin
2018-06-18 12:27:45 -05:00
LetterJayandGitHub 78265ad51b Merge pull request #7144 from Citadel-Station-13/upstream-merge-38524
[MIRROR] Fix some of the Lavaland roundstart atmos active turfs
2018-06-18 10:10:49 -05:00
81Dentonandletterjay 241d0c7a9a Adds dance machine, drink dispensers, flavor to beach bum ruin (#38533)
* shit was SO cash

* correct dance machine subtype

* moves defines from map file to corpse.dm

* improves bartender flavor text

* adds special shadycigs for beach ruin, adds shower, moves bartender sleeper to backroom
2018-06-18 09:37:48 -05:00
Tad Hardestyandletterjay 27b80045ad Fix some of the Lavaland roundstart atmos active turfs (#38524) 2018-06-17 03:15:08 -05:00
Dax Dupontandletterjay f5132ba0fc Makes the xeno nest ruin harder to cheese. (#38504)
* Makes the xeno nest ruin harder to cheese.

* space
2018-06-16 21:47:16 -05:00