Commit Graph
949 Commits
Author SHA1 Message Date
xxalpha d17c0cc8c4 Fixed Wizard Den broken airlock icons. 2015-09-09 03:19:56 +01:00
bgobandit 652260af2a THERE TRAVIS SHOULD BE FUCKING FIXED NOW FUCK GODDAMN FUCK YOUR SHITTING FUCKING CODE FROM THE DEPTHS OF SHIT 2015-09-06 14:35:23 -04:00
bgobandit c5984f4359 Merge branch 'master' of https://github.com/tgstation/-tg-station into legitposters
Conflicts:
	_maps/map_files/MetaStation/MetaStation.v41G.dmm
2015-09-06 13:27:51 -04:00
Aranclanos ee458bb3db Merge pull request #11254 from duncathan/pipecleanup
Pipe code cleanup
2015-09-05 04:12:36 -03:00
bgobandit 14013ea257 fuck you travis you clown 2015-09-04 19:55:48 -04:00
bgobandit 261494e659 Made some changes and repathing for posters. 2015-09-04 18:30:58 -04:00
c0 df7386a4ec Assemblies update 2015-09-04 11:22:37 +03:00
metacide 92d2a09bf3 Updated MetaStation.v41G.dmm
*Fixed % chance on xeno egg spawner - now 2%, was 4%
2015-09-02 21:15:24 +01:00
metacide d7acb6ac42 Updated MetaStation.v41G.dmm
*Fixed issue with some spawners
2015-09-02 20:17:28 +01:00
metacide 8ab06a2287 Updated MetaStation.v41F.dmm to MetaStation.v41G.dmm
Updated MetaStation/z2.dmm
*Altered the AI chamber so it is (hopefully) somewhat more secure
*Added AI liquid dispensers to the AI chamber foyer and two adjacent siderooms
*Added far more varied blob spawn locations
*Added (provisionally) a 2% chance roundstart xeno egg in the secure lab test chamber
*Added photocopier to security office and warden's office
*Added Captain's wallsafe variant to their quarters
*Added shutters to the armory for ease of arming security
*Adjusted club spawner to mostly spawn russian roulette revolvers, somtimes syndicards, rarely ninja stars
*Adjusted MiniSat powergrid - it is now independent of the station, but easy to hook up
*Fixed issue with z2 where part of the syndicate mothership wasn't designated properly causing depowered TC console
*Fixed invisible doors: starboard emergency storage, brig infirmary maint, both fore solar control room doors
*Fixed missing revenant spawners and Marauder entry points
*Fixed a few blob spawn locations being dangerously close to fueltanks
*Fixed duplicate CMO stamp on their desk
*Fixed a few access issues on maint. doors around research
*Fixed heat passing through toxins burn chamber glass doors
*Fixed missing Pugley IV sprite
*Moved north-west nuke op shuttle location further away from the station
*Moved routing manifold segment of disposals which routes to Captain's Office adjacent to the office, under a camera, so it can more easily be checked for tampering
*Replaced the walls connecting MiniSat walkway to the MiniSat proper with girders or lattices for better visibility
*Replaced now-destructible shuttle turf at the bombsite with indestructible centcom-style turf
*Switched general intercom outside AI chamber to the private AI channel
2015-09-02 19:41:58 +01:00
duncathan 381139422c Merge branch 'master' of https://github.com/tgstation/-tg-station into pipecleanup
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/components_base.dm
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/ATMOSPHERICS/components/unary_devices/vent_pump.dm
	code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
	code/ATMOSPHERICS/pipes/manifold.dm
	code/ATMOSPHERICS/pipes/manifold4w.dm
	code/ATMOSPHERICS/pipes/simple.dm
	code/_compile_options.dm
	code/controllers/subsystem/garbage.dm
	code/game/machinery/bots/mulebot.dm
	code/modules/mob/living/carbon/alien/say.dm
	code/modules/mob/living/simple_animal/bot_swarm/swarmer.dm
	html/changelogs/.all_changelog.yml
2015-09-01 20:29:00 -06:00
xxalpha c24a2575b0 Fixed metastation compilation again 2015-08-30 20:18:10 +01: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
xxalpha a009ead939 Fixed metastation and ministation compilation. 2015-08-28 08:50:49 +01: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
xxalpha 47e68ee37c Removed obsolete icon files.
Fixed

Fixed wizard doors
2015-08-27 16:52:15 +01:00
duncathan cead1653c0 changes associative lists to standard lists; updates MiniStation.dmm 2015-08-17 21:46:39 -06: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