Commit Graph

1139 Commits

Author SHA1 Message Date
Razharas c66c206db3 Fixes injector in incinerator on box 2015-12-03 16:41:55 +03:00
Cheridan e1fe9bb0e5 Merge pull request #13360 from Strathcona/SlimeKiller
Modifies the Xeno Kill Chamber to use cold air instead of vacuum [Box]
2015-12-02 17:16:18 -06:00
Strathcona 0eee27ef16 Merge conflict fixed please 2015-12-02 09:35:40 -05:00
swankcookie da5b7dc818 i hate dreamstation04.dmm
Signed-off-by: Swankcookie
2015-12-01 22:02:32 -06:00
swankcookie 3e5e9086c0 fix 2015-12-01 21:52:35 -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
Incoming ff58f4b5d3 Adds a single xmas tree to bird and mini 2015-11-30 23:17:38 -05: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
WJohn 7c86c0667c Merge pull request #13316 from KorPhaeron/listening_post
Moves Listening Post to Z6, removes it as an away mission
2015-11-30 20:14:14 -05:00
Incoming b2ebbdad3a somehow it happened twice. This never happened before I swear it 2015-11-30 17:37:14 -05:00
Incoming 3492252afb somehow a step_x/step_y got in with a tree, weird. Would have been symptomless since they were both 0 but hey, good catch grepper. 2015-11-30 17:13:28 -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
Nerd Lord e6ea5b3b5d This should fix dreamstation, at least I hope it does because if it doesn't I'm fucked. 2015-11-28 15:29:55 -05:00
Nerd Lord ef122af446 i uh, shit 2015-11-27 16:21:16 -05:00
Nerd Lord 70265228b6 Should fix conflicts 2015-11-27 16:19:52 -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
Nerd Lord 54bc865502 Expands Dreamstation maintenance to have more rooms to shove corpses into and do antaggy shit in.
Also moves the singularity generator object out of the PA's line of fire, so it's slightly harder to set up. The reason for this should be abundantly clear.
2015-11-27 15:04:00 -05:00
phil235 da0ba3659f Merge pull request #13239 from AnturK/animalbots
Simple Animal Bots - Beepsky strikes back.
2015-11-27 17:37:59 +01:00
Cheridan 762568255d Merge pull request #13102 from bgobandit/newmininggear
Various mining additions, fixes, nerfs and buffs (ready for review/merge).
2015-11-26 18:11:26 -06:00
AnturK 235649c4c6 Map Changes - 2.0 2015-11-26 22:16:44 +01:00
duncathan salt e596033153 Merge pull request #13133 from Strathcona/DiscStationRefresh
DiscStation Cargo Update + stuff
2015-11-26 09:41:24 -06:00
Strathcona a02dfe95d0 New Pods 2015-11-25 13:41:37 -05:00
Strathcona d8807c6d01 Merge remote-tracking branch 'tgstation/master' into DiscStationRefresh 2015-11-25 09:59:48 -05:00
AnturK 7ead90f24b Map Changes 3.0 2015-11-25 14:46:16 +01:00
Nerd Lord f3df3379ed Adds pod consoles to dreamstation.
Also adds a maint room by escape for antags, thank me later.
2015-11-24 20:00:28 -05:00
KorPhaeron c04d80f5be Fixes 2015-11-24 08:37:47 -06:00
KorPhaeron defc1ca2e9 Early pod launch 2015-11-23 17:45:35 -06:00
Strathcona 51868abf62 Fire Safety
added a bunch more fire extinguishers
2015-11-21 13:21:26 -05:00
Strathcona a9655af5a7 Missed a few Cameras 2015-11-20 10:09:48 -05:00
Strathcona 6adb378e75 DiscStation Cargo Update + stuff 2015-11-20 08:58:01 -05:00
Cheridan b8248f0b14 Merge pull request #13105 from Tokiko1/birdstationupdate5
Birdstation update #5 mining
2015-11-19 21:03:59 -06:00
bgobandit 899e6ecaf9 Merge branch 'master' of https://github.com/tgstation/-tg-station into newmininggear
Conflicts:
	_maps/map_files/DreamStation/dreamstation04.dmm
2015-11-18 19:55:06 -05:00
bgobandit b928b8ec18 fixes memestation, ups ore points slightly 2015-11-18 19:51:49 -05:00
Lzimann d31fb873a4 Removed 'oxygen is toxic to humans' module from some emergency storage(I have no idea why it was there in the first place.) 2015-11-18 17:12:04 -02:00
Lzimann 1dbddebfed Some camera fixes. - Asteroid Station 2015-11-18 17:06:35 -02:00
Lzimann b9dae8a437 Fixed engineer's sec office button. 2015-11-18 10:00:59 -02:00
Tokiko1 c72cb950ee Mining:
Added a cyborg and mech charger to the mining station.
Added a lot of high chance ore spawns to the outer asteroids to make it more desireble to mine these.
Main mining asteroid roughly doubled in size.
Added some wumborian fugus to the asteroid.
Added a few bananium ore patches to the main asteroid.
Removed all but one xenoegg spawns, made the remaining one spawn an embryo on failure.
Added a large amount of mobs to the room containing the xenoegg to stop players from easily obtaining it.

Station:
Added a bunch of RP related items suggested by people.
Removed autorifles from the armory.
Added riot shotguns and rubber + lethal ammo to armory.
Added special temperature guns to the armory that come with pins and have reduced research levels.
Replaced the energy guns in the armory with disablers.
Added a random organ spawner locker to xenomed.
Modified xenobio maint to allow slime console cursors to move through it.
Added a second slime management console.
Added science goggles to chem and science.
Added beer goggles to the kitchen.
Changed the oxygen pipe color near the supermatter engine to cyan.
Changed the reflector layout in engineering.
Added a safety door between the supermatter engine room and the reflector room.
Added a coin press just outside of the maint casino.
Fixed the backwards piano in the theatre.
Replaced the armory desk with a window.
Added more portable flashers to security.
2015-11-18 12:55:56 +01:00
Lzimann 218e814399 Asteroid Fixes
- Fixed the windows in shuttle not having plating below them
- Fixed security closets not having baton in them
- Removed the wall below a maint door below teleporter.
2015-11-17 13:14:59 -02:00
duncathan salt 621c9e28c1 Merge pull request #13062 from optimumtact/chemchanges
Chemistry Balancing and Additions
2015-11-16 17:42:08 -06:00
Cheridan faae120f19 Merge pull request #13031 from Anonus/dreamon
Fixes the last known Dreamstation issue
2015-11-15 21:08:05 -06: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
Nerd Lord 23fbd39335 report issues tbh fam 2015-11-15 00:00:57 -05:00
Xhuis d51813a48f Chemistry rebalances and additions 2015-11-14 22:17:54 -05:00
Nerd Lord 296818bb1e Fixes the actual last issue I wish people reported issues tbh 2015-11-14 22:14:44 -05:00
Nerd Lord 89eb2ae4a0 Fixes the bridge AI displays on dreamstation being lower than the windows. 2015-11-14 21:44:10 -05:00
Lzimann 0a108031a9 Air alarm in servers' room fixed. 2015-11-14 13:51:25 -02:00