Commit Graph

172 Commits

Author SHA1 Message Date
c0 a690abcf92 Plant Refactor: Seeds 2016-03-04 02:35:51 +03:00
KorPhaeron 31a723d543 Merge pull request #15783 from hornygranny/laws
removes roundstart paladin and robocop boards
2016-02-29 14:37:29 -06:00
c0 3898243d6a Removed cocroaches 2016-02-28 04:44:27 +03:00
hornygranny 69473f9221 removes roundstart robocop and paladin boards 2016-02-26 20:20:32 -08:00
Steelpoint b73e8ed9a5 FinalChange 2016-02-22 17:48:18 +08:00
duncathan salt db5c47b6b2 Merge pull request #15598 from Incoming5643/ape_escape_2
Adds the new pun pun to the maps
2016-02-19 04:09:18 -06:00
AnturK ba750e34e9 Repaths 2016-02-18 17:56:43 +01:00
Incoming 2ec1b145fe Adds the new pun pun to the maps 2016-02-18 02:42:19 -05:00
tkdrg a7ba087517 Merge pull request #15478 from neersighted/remiepls
Repath janicarts/secways/atvs
2016-02-13 22:10:53 -03:00
Bjorn Neergaard 80515f1d38 Repath janicarts/secways/atvs
Remove the path compability in favor of true pathing
2016-02-12 17:10:00 -06:00
oranges 67882a1758 Fix the faction for Araneus on Metastation 2016-02-12 09:27:53 +13:00
Bjorn Neergaard 9386602acf tgui cargo console
rewrite awful shuttle/cargo code a lot as well
2016-02-05 17:06:07 -06:00
Bjorn Neergaard 796cca2753 tgui scrubbers
removes area atmos computer
2016-02-05 17:06:02 -06:00
tkdrg e31624d6ee Merge pull request #15163 from Incoming5643/Iwishitwaschristmastoday
del_all(christmas)
2016-02-04 22:44:06 -03:00
Incoming 98468506a1 The groundhog didn't see his shadow today, so it looks like Christmas will end six weeks early this year. 2016-02-03 02:08:33 -05:00
oranges 514b860fab Makes AI turrets better use the syndicate faction
Sets the faction to be syndicate, drones will now be targeted
2016-02-03 12:18:28 +13:00
KorPhaeron 77330ccd1f Shuttle Launch 2016-01-27 23:17:55 -06:00
Razharas 01831fc8eb Merge pull request #14862 from KazeEspada/LizardHunting
Lizard hunting
2016-01-26 08:01:11 +03:00
Bjorn Neergaard 68e1269ea7 Repath thank dispensers; fix ASSteroid station; repath SSU ract 2016-01-25 12:03:13 -06:00
Bjorn Neergaard f3697fc7d6 Repath air alarms 2016-01-25 12:02:58 -06:00
KazeEspada 17fe36ebda Merge branch 'master' of https://github.com/tgstation/-tg-station into LizardHunting 2016-01-24 15:14:00 -07:00
KazeEspada b774041648 Lizards now hunt and kill insects, they swallow them whole.
"We vorestation now." -Iamgoofball.
2016-01-24 15:13:46 -07:00
Bjorn Neergaard dae73b28e8 Refactor atmos_control into only one computer 2016-01-23 18:56:37 -06:00
Bjorn Neergaard 59b7419593 Remove roomfiller canister, repath n20 to n2o 2016-01-22 19:25:38 -06:00
Bjorn Neergaard 9f719154ed Fix meta heaters 2016-01-22 19:25:37 -06:00
Bjorn Neergaard 4c192d705a Rewrite heaters/freezers; port to tgui
They are now one type, thermomachine.
2016-01-22 19:25:35 -06:00
Bjorn Neergaard 1c64360882 tgui atmos control computers 2016-01-18 14:21:57 -06:00
Bjorn Neergaard b95a58c8fb Repath canisters; make label code create a new can; use es6 function shorthand
By making a new canister when relabeled, we can make the name/desc identical to a
mapped canister, and remove hacky snowflake code
2016-01-16 12:13:51 -06:00
duncathan 9066bc7c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract
2016-01-13 20:07:21 -06:00
KorPhaeron 6be292913a Fixes 2016-01-04 20:10:13 -06:00
Mike Long e6011aa1f0 Detectives camera is now a subtype. Changed maps to have the subtype instead of the modified regular camera. 2016-01-03 07:36:12 -05:00
duncathan b18c6c2c5c Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
Conflicts:
	nano/assets/nanoui.js
	nano/bower.json
	nano/templates/atmos_filter.dot
2016-01-02 18:02:54 -06:00
Mike Long 4434974521 Grammatical fix to Detective's Camera.
Fixes #14232
Also removes description saying 30 photos left, as that number did not change as the number of photos remaining decreased.  It still shows number of photos remaining on examine.
2016-01-01 17:29:56 -05:00
duncathan 9e77fffe2a maps and nano 2015-12-30 00:06:42 -06:00
KazeEspada f377397a2a Cockroaches added to Meta and Box. Focus on maintenance, especially around food and trash. Also, there are some in engineering around the PA as a reference to being rad proof. 2015-12-26 15:54:49 -07:00
AndrewJacksonThe2nd 67a72501fe Puts the singulo gen on the platform next to the tesla gen, equal opportunities 2015-12-19 19:51:52 -08:00
AndrewJacksonThe2nd c0870c1fe5 Maps tesla into all 4 maps that used Singularity engine except Dream. 2015-12-19 19:04:47 -08:00
KorPhaeron 1dc9a004fd Metastation 2015-12-18 03:57:47 -06:00
KorPhaeron 25c86f316d Barricade changes 2015-12-09 12:06:41 -06:00
swankcookie da5b7dc818 i hate dreamstation04.dmm
Signed-off-by: Swankcookie
2015-12-01 22:02:32 -06: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
Remie Richards f55246e5c0 Merge pull request #12987 from AnturK/turrets
Removes gun_turret type and makes turret controls buildable
2015-11-27 20:52:59 +00:00
AnturK 235649c4c6 Map Changes - 2.0 2015-11-26 22:16:44 +01:00
AnturK 7ead90f24b Map Changes 3.0 2015-11-25 14:46:16 +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
metacide a0098aa6ce Updated MetaStation.v41I.dmm
*Added monitors to the AI chamber foyer, allowing borgs to see into the AI chamber and open the blast door over the entrance
*Removed extra autorifle left in armory
2015-11-01 15:55:22 +00:00
metacide 05b45906d6 Updated MetaStation.v41H.dmm to MetaStation.v41I.dmm
Updated metastation.dm
*Added a few posters to non-command non-security areas of the station
*Added more flashes to the AI chamber to give AIs more delaying power against borg attacks
*Added more twists and turns to some of the long, straight paths in maintenance
*Added windows to the mailroom conveyor to stop mail falling off it
*Added lethal shotgun ammo locker and rubber buckshot boxes to the armory
*Added independent area designation to armory (formerly part of brig control)
*Added winter boots to various lockers in the locker room
*Gave roboticists access to the R&D lab
*Moved AI chamber shutter control closer to the door so borgs can still get in
*Moved AI holopads off vents on the MiniSat walkway
*Remove most autorifles - one remains in the armory, one in the warden's locker.
*Removed posters from command/security areas
*Removed random grille spawns blocking areas of maintenance
*Removed duplicate intercom in the teleporter room
*Renamed Secure Lab to Xenobiology again for slime management system
2015-11-01 14:21:59 +00:00
Jordie0608 1444504f1e removes \improper from turret control id 2015-10-29 12:30:46 +11: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