Commit Graph

933 Commits

Author SHA1 Message Date
c0 97b792bbc3 Changed some circuits paths to reduce copypasta 2015-08-30 16:58:13 +03:00
c0 4374c96117 Fixes 2015-08-28 10:44:34 +03:00
c0 8474086bce Buttons and wall frames rework 2015-08-28 02:01:49 +03: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
Jordie d5a88d3f98 Merge pull request #10957 from Core0verload/surgery-organs-implants
Implants, Surgery and Organs rework: Phase 1
2015-08-04 21:45:02 +10:00
Jordie0608 c0e125b1ae box and mining fixes 2015-08-02 20:06:21 +10:00
c0 04f7b3f2de Surgery, Implants and Organs rework: Phase 1 2015-07-31 22:18:31 +03: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
Jordie adeb5f09cd Merge pull request #10589 from Chiefwaffles/Obsolete_AI_2016
Adds the Automated Announcement System
2015-07-29 17:14:02 +10:00
CorruptComputer 588afd338f missed 1 2015-07-28 18:43:17 -05:00
CorruptComputer a3e2121714 Removes step's 2015-07-28 18:40:49 -05:00
Cheridan 926b603958 Merge pull request #10869 from Midaychi/master
QoL change for derelict drones
2015-07-27 16:51:36 -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
Swag McYolosteinen 213e1f3bd6 Merge pull request #10847 from CorruptComputer/miscFixes
Misc Fixes to AsteroidStation
2015-07-27 11:49:33 +02: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
Chiefwaffles 1c59a84660 Dumb byond stuff fixed and merge conflict fixed for the gazillionth time. 2015-07-25 16:19:21 -07:00
CorruptComputer cf6d6fdfe5 Misc Fixes to AsteroidStation 2015-07-24 22:14:24 -05:00
bgobandit 473c06d147 Merge branch 'master' of https://github.com/tgstation/-tg-station into catsandpugs 2015-07-24 17:45:03 -04:00
Metacide f424cb85a6 Updated MetaStation.v41E.dmm to MetaStation.v41F.dmm
Updated MetaStation/z2.dmm
Updated MetaStation/z3.dmm
Updated MetaStation/z4.dmm
Updated MetaStation/z5.dmm
*Added one roll of cable coil to the bartenders' backroom closet
*Added shutters to the detective's office, improved various other ones
*Adjusted layout of the MiniSat so that telecomms is easier to access and sabotage
*Adjusted layout of execution chamber
*Fixed missing window on the emergency shuttle
*Fixed ~260 tiles having active atmos interactions on roundstart
*Fixed RD RC and AI integrity restorer being inaccessible
*Fixed broken sprite under spare office door
*Fixed newscaster behind perma basketball hoop
*Fixed AI core cameras incorrectly being on SS13 and MiniSat camera networks
*Fixed output direction of counterfeit exosuit fabricator
*Granted theatre and bartender access to all maint doors on the top-right of the service area
*Moved disposals unit in virology so you can throw bottles into it from the desk
2015-07-24 21:49:37 +01: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
bgobandit 0d9f7dcb4a Merge branch 'master' of https://github.com/tgstation/-tg-station into catsandpugs
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-07-24 11:58:52 -04:00
Ikarrus 1ab0bc6095 Merge branch 'master' of https://github.com/tgstation/-tg-station into thisisMYmap
Resolved Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-07-24 09:27:18 -06:00
Aranclanos 941559822d Merge pull request #10785 from ojacobson/active-turfs-at-round-start
Remove all the "active turfs at round start" warnings from Box
2015-07-24 07:06:17 -03:00
Steelpoint 68b5dd2979 Merge branch 'master' of https://github.com/tgstation/-tg-station into AyylienGun
Conflicts:
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/obj/guns/energy.dmi
2015-07-24 16:59:21 +08:00
bgobandit 5b5ba6582d backup ded pls backup 2015-07-24 02:29: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
MrStonedOne a870f28e3d fixes pixel placement of the external airlock sign south of science 2015-07-23 19:29:27 -07:00
MrStonedOne e564f94049 PROPERLY fixes pixel movement 2015-07-23 18:58:43 -07:00
MrStonedOne fcae0f424d Revert "Fixes movement on boxstation" 2015-07-23 18:36:46 -07: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
Incoming e9a3d5487e Fixes movement on boxstation by removing the airlock sign that had the offending step_x var edit on it.
The airlock is glass and surrounded by space, you don't need a sign for people to know it leads to space!
2015-07-23 19:07:20 -04:00
Metacide 7bff5d00cd Updated MetaStation.v41D.dmm to MetaStation.v41E.dmm
Updated MetaStation/z2.dmm
Updated MetaStation/z3.dmm
*Added a fuel output pipe to atmospherics that connects directly to the incinerator turbine
*Added a filtration set-up on one of the rows of canister ports in atmospherics
*Added heater/freezers connected to the distro, mix tank output, and pure gas output loops
*Added more walls and privacy shutters to the corporate showroom
*Added missing health HUDs back to medbay
*Added departmental management consoles for each head of staff
*Added more security lockers to the brig
*Added rubber buckshot to the ammunition locker in the armory
*Added stacks of warning cones to security and engineering
*Added a basketball and hoop to perma
*Added privacy shutters to chemistry and improved the ones in research and genetics
*Added an air vent to the chapel mass driver
*Added a wrench to the warden's office for setting up flashers
*Adjusted some tiles outside security for better symmetry
*Adjusted layout of the teleporter room to make it less crowded
*Adjusted layout of the HoP's office to make managing paperwork easier
*Adjusted layout of the warden's office so they can better view the three brig cells
*Enlarged the emergency shuttle - making the brig, medbay,and the bridge each 1 tile higher
*Enlarged and improved the incinerator room
*Fixed beakers outputting below chemical dispensers in various places
*Fixed SMES cells being designated part of the CE's office
*Fixed broken TV and nuke sprites in the corporate showroom
*Fixed Mopficcer Sweepsky's name
*Fixed comms console on the emergency shuttle counting as station-based for autocall checks
*Fixed (possibly) the central wall block at the toxins test site - it should now be indestructible again
*Moved chemistry smartfridge up so it can be accessed from the medical lobby
*Replaced the second securitron, Inspector Johnson, with a patrolling medibot version
*Replaced the secure lab chemical dispenser with a portable variant
*Switched the locations of the AI core SMES and primary AI to stop lasering the AI from the door
*Switched the directions of the cargo conveyor belts - the longer belt is now the input belt
2015-07-23 20:18:41 +01:00
bgobandit f932fac0db HONK NOW IT SHOULD BE FIXED 2015-07-23 12:02:41 -04:00
Ikarrus 7cf007c203 [Box Map] Brig Updates 2015-07-23 09:29:24 -06:00
bgobandit fcb081f0e1 (hopefully) fixes merge conflict, adds changelog entry 2015-07-23 11:22:49 -04:00
bgobandit df836d0f73 Cats and pugs now respond when you pet them. Pugs and corgis are now under the same dog parent, and all dog code is moved to dog.dm (corgi.dm and pug.dm no longer exist). Updates pathing across all areas of code and on all included maps. Fixes a minor pet collar naming bug. 2015-07-23 10:49:06 -04:00
Chiefwaffles eaa271b8c2 FIXES A CONFLICT THAT ISN'T EVEN MINE 2015-07-22 17:36:08 -07:00
Dorsisdwarf e0f1760052 Fixes piping errors 2015-07-21 12:38:23 +01:00
Dorsisdwarf a7d3f8f36e Creates 'pockets', cuts down bloat, reduces cut-throughs 2015-07-21 11:56:12 +01:00
Dorsisdwarf 7e8664d217 Buffs maint, readds maint bar, fixes toxins test site 2015-07-20 16:56:47 +01:00
Aranclanos 4aede30c5e Merge pull request #10671 from Metacide/master
Updated MetaStation.v41A.II.dmm to MetaStation.v41D.dmm (Take 2)
2015-07-18 06:40:18 -03:00
CorruptComputer 7ce8ab5a61 Merge branch 'master' of https://github.com/tgstation/-tg-station into moreAsteroidFixes
Conflicts:
	_maps/map_files/AsteroidStation/Asteroidstation.dmm
2015-07-17 23:04:51 -05:00
Chiefwaffles 37625502bb Fixes ANOTHER conflict. 2015-07-17 18:37:52 -07:00
duncathan 80ecb3813f fixes maint freezer direction on box; fixes roundstart runtimes 2015-07-17 14:54:19 -06:00
Metacide b01578bf8a Updated z2.dmm
*Fixed issue with emergency shuttle rotating in transit
2015-07-17 17:12:19 +01:00
Metacide c7cc18f4eb Updated MetaStation.v41A.II.dmm to MetaStation.v41D.dmm
Updated z2.dmm and z3.dmm
*Updated Centcom to current version, with added gun/device 'museum' at the escape shuttle dock
*Added extra signs to help navigate between departments
*Added conveyor belt levers to the cargo shuttle
*Added two more air vents to the minisat walkways
*Added commemorative plaque to random tile which has been in deep space for some time
*Added condimaster to bartender's backroom
*Added stack of regular glass to EVA table for regular-glass repairs
*Added missing cargo tech locker to cargo bay
*Replaced all flooring in research firing range with disguised reinforced tiles
*Replaced screwdrivers in botany crate with wirecutters
*Fixed various issues with bot patrol routes
*Fixed conveyors on the cargo shuttle going to the wrong way
*Fixed virology break 'romm' typo
*Fixed emergency shuttle brig being blue and not counting as brig for antag redtext
*Fixed pipe near minisat teleporter occasioanlly resulting in teleported ventcrawlers
*Fixed broken bartender's closet
*Fixed misaligned air scrubber in the cargo bay
*Fixed camera names in experimentation lab and bar backroom
*Fixed odd ventcrawl movement at a vent near arrivals
*Moved mopficcer sweepsky the cleanbot to the center of the station, starting on auto-patrol
*Removed duplicate TV screens in the library private study rooms
2015-07-17 16:29:31 +01:00