Commit Graph

239 Commits

Author SHA1 Message Date
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
kevinz000
c9d67ecd49 Merge pull request #8667 from Ghommie/Ghommie-cit61
Ports the system for randomized semi-persistent chem reactions.
2019-06-23 06:54:43 -07:00
kevinz000
94d92f7b1b Merge pull request #8664 from BlackMajor/MeMapGood
Adds another space ruin
2019-06-23 06:49:37 -07:00
Trilbyspaceclone
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
Ghommie
50dd512be7 Ports system for randomized semi-persistent chem reactions. 2019-06-17 10:50:40 +02:00
BlackMajor
1060bb05b4 Space hermit ruin 2019-06-17 17:41:46 +12:00
kevinz000
27333276de Merge pull request #8570 from Trilbyspaceclone/patch-170
Ports origami skills for paper wiz loot
2019-06-16 19:40:01 -07:00
kevinz000
d9119d43f0 Merge pull request #8627 from BlackMajor/MeMapGood
Adds more space ruins.
2019-06-16 19:29:23 -07:00
deathride58
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
9219a2c813 Adding more ruins 2019-06-15 21:17:34 +12:00
BlackMajor
4528384976 Fuck it lets add way more spiciest PR 2019-06-15 19:03:04 +12:00
BlackMajor
9b01830987 Added fuel tank and welding goggles 2019-06-13 21:37:45 +12:00
BlackMajor
0f8b6f72f8 Get the fuck out step_x/y 2019-06-12 15:08:20 +12:00
BlackMajor
b2c5430f6a Shit's done 2019-06-12 14:46:23 +12:00
BlackMajor
e2ad96f4c9 Made a shitty space ruin robotics lab 2019-06-12 01:21:16 +12: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
kevinz000
e13efe26bd Merge pull request #8493 from Sishen1542/Oldstat
Fixes THAT Oldstation Tile
2019-06-08 01:08:44 -07:00
kevinz000
8c632bed6f Merge pull request #8391 from Trilbyspaceclone/patch-132
Gives pod lava land ruin a autolathen
2019-06-08 01:00:41 -07:00
Trilbyspaceclone
c0d1ac5bd3 Update originalcontent.dmm 2019-06-07 18:42:23 -04:00
Sishen
d7fdaed181 Fixes the Oldstation Tile 2019-05-30 15:45:17 -04:00
Useroth
90b62234d6 Made the hotel booze-o-mat hacked by default. 2019-05-22 20:13:58 +02:00
Useroth
9441853f6d Boltable hotel. Now with mapmerge. 2019-05-22 19:28:50 +02:00
Trilbyspaceclone
a68c40a1a0 Update lavaland_surface_seed_vault.dmm 2019-05-20 15:29:52 -04:00
Trilbyspaceclone
9ff2132055 Update lavaland_surface_seed_vault.dmm 2019-05-18 12:52:59 -04:00
Poojawa
e6597a192a Fixed duplicate turfs 2019-04-14 00:04:24 -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
Trilbyspaceclone
b1205baa76 Update mrow_thats_right.dmm 2019-03-18 17:41:12 -04:00
deathride58
1c7fc9c699 Merge pull request #8067 from Trilbyspaceclone/patch-67
Makes Dinner for two have loot
2019-03-08 20:44:23 -05:00
Trilbyspaceclone
7edaff99de Update derelict2.dmm 2019-02-28 19:01:54 -05:00
Trilbyspaceclone
e84683330f Update derelict1.dmm 2019-02-27 16:20:46 -05:00
Tupinambis
58347dad9b Stop self antagging you shits (#7878) 2019-01-03 04:34:55 -08:00
Trilbyspaceclone
f2ae556ee4 Adds two boxes of candles to DEEP (#7851) 2018-12-31 03:06:50 -08:00
Tupinambis
828b631570 Increased Ash Walker resistances, makes them ash proof. Improves the Base. 2018-12-15 15:33:19 -06:00
Tupinambis
338a98972f Makes the ruin more of a challenge. 2018-11-16 22:34:34 -06:00
Tupinambis
bfe8fda260 Makes hivebots more robust. Makes oldstation not have an excessive amount of hivebots. 2018-11-15 20:25:06 -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
99e57fb221 various citadel tweaks/fixes
remeber to add //citadel edit to base code changes because we're still a downstream and hard syncs are still a thing
2018-09-17 03:26:05 -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
Tupinambis
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
Tupinambis
4b21b60269 Deep Storage Suit Loot Update. (Alternative to PR #7402) (#7449)
* Replaces syndicate hardsuit with mining hardsuit.

* adds jetpack
2018-08-16 13:02:11 -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
Jordan Brown
c11557d23d Global component signals 2018-06-19 17:18:34 -05:00
Cw 3040
27b6ebc612 Cw's Spaceruins, Maintbar and Kegspawn changes (#7141)
* Station Changes

-Added Jukebox to: Box (maintbar), Meta (maintbar), Pubby (maintbar),
and Omega (maintarcade)
-Added keg spawn to Pubby
-Removed Legcuffs and Rifle Stock from Box maintbar (people were unhappy
with the fact these were sprited identically to handcuffs, will re-add
if someone ports Virgo's legcuffs)

* Space Ruins Changes

-Added KinkMates to SpaceHotel
-Swapped riot helmet for AI detecting multitool on TurretedOutpost
-Changed the loot for oldAIsat to not have a suspicious toolbox, instead
having a toolbelt and combat gloves

* Kegspawn Change

Changed Spawn Rate of kegs to:
-50% mead (5 in 10 instead of 5 in 8)
-20% aphro (2 in 10 instead of 1 in 8)
-20% strong aphro (2 in 10 instead of 1 in 8)
-10% pan galactic gargle blaster (1 in 10 instead of 1 in 8)

* Small MetaStation Fixes

Fixed bug reported by Nethaufer (Zig)#5868 on discord, there was a wire
(and an air supply pipe) accidentally deleted.
2018-06-18 11:52:11 -07:00
LetterJay
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