Commit Graph

177 Commits

Author SHA1 Message Date
KorPhaeron 8de9b99182 Deepstrike 2 2015-12-17 23:22:37 -06:00
tkdrg d2d78c5e2c Merge pull request #13574 from Strathcona/MiningMap
Makes the Mining Asteroid Spikier
2015-12-16 14:34:53 -03:00
Strathcona 4ceabf8d06 Old mining station re-added 2015-12-14 21:16:34 -05:00
Strathcona 2c63aa5d94 git -reset --hard is your friend 2015-12-14 09:50:22 -05:00
Incoming5643 82aad54c80 step what are you doing there I didn't even touch you 2015-12-14 03:02:49 -05:00
Incoming 51ef838b0b Bugfix and a bit of flavor
Moves the nuke team spawn area a bit away from the shuttle to solve #12766

Gives the nuke ops a nuclear fission explosive toy

Creates a hidden nuke op memorial easter egg with the extra space created by the move
2015-12-14 02:55:31 -05:00
KorPhaeron db8d3f7857 Ops can't fly to Z3 or Z4 2015-12-09 13:12:03 -06:00
duncathan salt d616885241 Merge pull request #13338 from Incoming5643/tis_the_season_for_horrible_manual_placement
[Touching all the maps oh god] The reason for the season
2015-12-01 15:15:49 -06:00
duncathan salt c9ee58c120 Merge pull request #13253 from SuperSayu/abstract_holodeck
Holodeck Fixes
2015-11-30 21:26:52 -06:00
Vincent 16303c1c1f Changes flag name from ABSTRACT to NODECONSTRUCT
Removes holo-tables and holo-windows since those typepaths are no longer needed.
Updates Z2 to reflect this.  Removes spurious tag tags in Z2.
2015-11-30 20:26:03 -05:00
Incoming 591e3dceb5 Adds christmas stuff to asteroid, disc, dream, meta, and box.
This means two xmas trees per map, one in/near the bar and the other in/near the chapel. There's also a festivus pole in/near the RD's office. In a few cases a clearing of space in the bar came at the expense of a few chairs, tables, but if there were anything on said tables they've been moved to empty tables nearby.

Also adds a christmas tree to the centcom disembark (thank god that's generic now) and the magic robe compatible santa hat/suit to the wizards den.

Couldn't figure out how to edit bird/mini without it throwing telecomm exceptions at me due to them having special versions of those systems, so no christmas for them this year. There's not much in the way of room anyways.
2015-11-30 16:51:13 -05:00
KorPhaeron 0a4dca7a94 Moves listening post to Z6 2015-11-29 10:42:05 -06:00
KorPhaeron 6145b9c24f Revert "Removes listening post as an away mission, adds it to Z6"
This reverts commit cbd70ee3ec.
2015-11-29 10:35:36 -06:00
KorPhaeron cbd70ee3ec Removes listening post as an away mission, adds it to Z6 2015-11-29 10:34:49 -06:00
AnturK 235649c4c6 Map Changes - 2.0 2015-11-26 22:16:44 +01:00
Vincent faf5ddaceb Holodeck refactor and Enchancements
Moves holodeck code to modules/holodeck.  Repaths holodeck structures a little.  Cleans holodeck code and prepares for additional features (multiple holodecks, etc).  Should fix #4828.

Necessary map bugfixen for Asteroid, Disc, Dream, Meta, and TG.
Adds Lounge, Emergency Medical, pet center, and holdout room to the rec holodeck.

All items spawned by the holodeck will do only stamina damage, except when emagged.  This allows emergency medical to be staffed with scalpels and bonesaws and such.  Emergency medical has some functioning equipment but the only drugs available are in the sleeper.
2015-11-15 20:23:23 -05:00
Firecage b2937bf315 Changes the operating table to be an actual table. 2015-11-08 22:09:35 +02:00
MrPerson 73c0f5d462 Remove tags from some maps
Disc was left completely untouched. Dream was given only a single edit to keep the syndiebomb working. Meta and Bird are also both cleaned up now too. All map-specific custom z's were cleaned too.

Source of these tags is DM being stupid. When you use the "Generate instances based on icon states" option, for some ungodly reason it gives those instances a tag. Which is retarded, tags are supposed to be unique to each object.

I tried searching for legit uses of tag in code and found only a few landmarks and giving mobs a tag. In any event, setting tags on map objects is probably a really bad idea anyway.

Exact regex used to find these so you guys can check my work

; tag = "[^"]*"
#end/middle

(?<=\{)tag = "[^"]*";
#begin

\{tag = "[^"]*"\}
#solo
2015-10-24 09:07:32 -07:00
Jordie 4100536742 fixes transport shuttle floortype 2015-10-21 17:14:23 +11:00
Jordie0608 8d69148249 removes old shuttle dock template 2015-10-20 22:24:42 +11:00
Jordie0608 8281e505ff bird and discstation pass, replaces z2 airlocks with poddoors 2015-10-18 01:52:22 +11:00
Jordie0608 b919eed9cc pass for metastation, code improvement 2015-10-15 19:06:53 +11:00
Jordie0608 69a6c82654 station placed shuttles demonstration 2015-10-13 21:49:52 +11:00
phil235 9c79257aab Changes the paths of stools, beds and chairs. It is now obj/structure/bed/chair and obj/structure/bed/stool. It makes much more sense since stools barely have any code of their own.
Beds (and chairs) now have buildstacktype and buildstackamount vars to handle how many sheets of what they should drop on deconstruction.
They also have a foldabletype var to handle folding into item (currently only used by roller beds) so that people can add foldable chairs in the future.
Fixes swivel chairs not dropping the correct amount of metal sheets.
2015-10-10 13:35:00 +02:00
Razharas 01a23d020e Merge pull request #11848 from xxalpha/smoothlattice
Lattices and catwalks now use generic icon smoothing.
2015-09-24 01:39:12 +03:00
xxalpha 6bdd100eb6 Lattices and catwalks now use generic icon smoothing.
Put another check in smooth code to prevent runtimes
2015-09-19 14:55:09 +01:00
Incoming b0e29efd23 Fixes the crisis of the wand of emergency engine ignition breaking keyfabe
Fixes the Byond Random Number Generator joke structure, who's icon has been missing for like... a year.
2015-09-18 22:28:46 -04:00
xxalpha d17c0cc8c4 Fixed Wizard Den broken airlock icons. 2015-09-09 03:19:56 +01:00
c0 df7386a4ec Assemblies update 2015-09-04 11:22:37 +03:00
xxalpha 94f045b73f Merge remote-tracking branch 'upstream/master' into airlocking
Conflicts:
	_maps/map_files/MetaStation/MetaStation.v41F.dmm
	code/game/objects/structures/door_assembly.dm
2015-08-30 19:53:54 +01:00
c0 97b792bbc3 Changed some circuits paths to reduce copypasta 2015-08-30 16:58:13 +03:00
c0 8474086bce Buttons and wall frames rework 2015-08-28 02:01:49 +03:00
xxalpha 47e68ee37c Removed obsolete icon files.
Fixed

Fixed wizard doors
2015-08-27 16:52:15 +01:00
WJohn 2eb01b7933 Fixes missing turrets on syndie shuttles for box and meta. 2015-08-11 05:02:41 -04:00
WJohn 10b00c0870 More map fixes.
Fixes #11054
Fixes #10896
Fixes #10049
Changes look of bomb-proof wall on toxins test site to riveted like on centcom.
Cleans up various area boundaries around the station, shouldn't have any effect on gameplay but looks cleaner when mapping.
2015-08-09 23:00:01 -04:00
Jordie0608 c0e125b1ae box and mining fixes 2015-08-02 20:06:21 +10:00
phil235 95be17923e Merge branch 'master' of https://github.com/tgstation/-tg-station into DisposalStuff
Conflicts:
	_maps/map_files/AsteroidStation/Asteroidstation.dmm
2015-07-30 16:34:39 +02:00
Jordie 9229890aae Merge pull request #10842 from lordpidey/lordpidey-new_chemicals
Added a new medication, Miner's Salve
2015-07-29 17:22:31 +10:00
CorruptComputer a3e2121714 Removes step's 2015-07-28 18:40:49 -05:00
Midaychi 89c8eea42b Added 6 new low rate maint loot spawner spots, upgraded one to be larger.
Added a pair of large air tanks. Use them well. (hint: you can filter them out to oxygen and nitrogen and store separately)
Added an ore satchel and a shovel to the clown shuttle, because noone goes mining with only a pickaxe. That'd be silly.
Added a cultivator, spade, and a nutrimax/seed vendor to the ex-security area, somewhere. Prisoners were supplementing their diet for sure.
Added a beaker of sulfuric acid.. somewhere. I forgot where. It's probably not important.
2015-07-27 04:56:23 -07:00
Mike Long 101eae808d Gave Miner's salve a slight side effect when ingested, to show that it's designed to be applied, not ingested.
Changed secondary recipe of Miner's Salve to be a sheet of iron+ a sheet of plasma + a twinkie in a grinder.  That seems more "ghetto chemistry"
Added grinder to mining station.
2015-07-26 16:18:59 -04:00
phil235 34b9a045fc Fixes non carbon being stunned when thrown and hitting something dense.
Fixes being able to enter a disposal bin while buckled.
Fixes items bouncing off delivery chute when thrown into it despite entering the chute.
Fixes being able to leave disposal pipes when moving inside pipes on a janicart.
Fixes some potential runtime (null loc) when flushing the disposal units.
Fixes the thrown range when being ejected from a disposal pipe.
2015-07-26 20:40:46 +02:00
Midaychi f5fbab39bc Adds random maint loot around derelict zlevel
Adds the boards for circuit imprinter, protolathe, and rdconsole
Adds and scatters enough stock parts to build those three machines around the derelict.
2015-07-26 09:55:57 -07:00
WJohn ea2b7fa50a Merge pull request #10622 from Steelpoint/AyylienGun
[SPRITE|MAP] Abductor Sprite and Animation Change
2015-07-24 12:33:13 -04:00
Owen Jacobson 3e133b610b Make rooms exposed to space more space-y by setting up atmos consistently.
Space-exposed turfs are now at a steady state at roundstart, and fully in vacuum. Bring internals and a hardsuit.
2015-07-23 23:36:50 -04:00
Owen Jacobson b3a8e07a1d Remove temperature setting from a bunch of turfs.
This silences a large swath of the "active turf on round start" warnings in the log.
2015-07-23 20:30:22 -04:00
Steelpoint 3249d63631 Merge branch 'master' of https://github.com/tgstation/-tg-station into AyylienGun
Conflicts:
	tgstation.dme
2015-07-16 19:15:48 +08:00
Steelpoint f96fdab622 CuffSprites 2015-07-15 19:38:29 +08:00
Steelpoint 60f05dc1ff AlienBox+AlienPaper 2015-07-15 15:05:01 +08:00
duncathan e074fb7856 makes air flow; fixes EVERYTHING 2015-07-11 18:45:19 -06:00