Commit Graph

85 Commits

Author SHA1 Message Date
Core0verload 04ce5e42cd World "?status" expansion, Topic() rework
* World "?status" expansion

* New helper procs for shuttles

* fix

* a fix
2016-04-06 02:15:25 -06:00
duncathan e86cf0f280 praise the good lord, for the game finally compiles 2016-03-29 19:04:37 -06:00
duncathan 3f1375ba39 Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
Conflicts:
	_maps/RandomZLevels/Cabin.dmm
	_maps/RandomZLevels/beach2.dmm
	_maps/RandomZLevels/caves.dmm
	_maps/RandomZLevels/research.dmm
	_maps/RandomZLevels/snowdin.dmm
	_maps/RandomZLevels/undergroundoutpost45.dmm
	_maps/map_files/DreamStation/dreamstation04.dmm
	_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
	_maps/map_files/MetaStation/MetaStation.v41I.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	_maps/map_files/generic/z4.dmm
	_maps/templates/lavaland_surface_automated_trade_outpost.dmm
	_maps/templates/lavaland_surface_biodome_winter.dmm
	_maps/templates/lavaland_surface_prisoner_crash.dmm
	_maps/templates/lavaland_surface_seed_vault.dmm
	code/controllers/subsystem/air.dm
	code/game/asteroid.dm
	code/game/atoms.dm
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/machinery/computer/arcade.dm
	code/game/objects/effects/aliens.dm
	code/game/objects/effects/overlays.dm
	code/game/objects/items/apc_frame.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/girders.dm
	code/game/turfs/simulated.dm
	code/game/turfs/simulated/floor/fancy_floor.dm
	code/game/turfs/simulated/floor/mineral_floor.dm
	code/game/turfs/simulated/floor/plating.dm
	code/game/turfs/simulated/river.dm
	code/game/turfs/simulated/walls_misc.dm
	code/game/turfs/simulated/walls_reinforced.dm
	code/modules/admin/verbs/buildmode.dm
	code/modules/atmospherics/environmental/LINDA_turf_tile.dm
	code/modules/events/spacevine.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/holodeck/turfs.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/interactive.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/bot/floorbot.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/living/simple_animal/hostile/hostile.dm
	code/modules/mob/mob_movement.dm
	code/modules/power/singularity/narsie.dm
	code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
	code/modules/research/server.dm
2016-03-29 14:46:06 -06:00
duncathan b9950c4358 turf/open and turf/closed 2016-03-29 13:38:56 -06:00
Cheridan 0288f7c592 Merge pull request #16067 from xxalpha/silky_smooth
icon smooth ss
2016-03-15 04:59:48 -05:00
KorPhaeron 24eb9bd457 White ship can land on lavaland 2016-03-14 14:44:55 -05:00
xxalpha 688137c7dc icon smooth ss
adjustments

adjustements

atharrachaidhean
2016-03-12 23:57:45 +00:00
KorPhaeron 2bb3f668c2 Merge 2016-03-12 15:03:57 -06:00
KorPhaeron 05c3b2d07b Test 2016-03-10 22:41:27 -06:00
duncathan 5bf31463da removes simulated turfs; adds space gas mixture for space 2016-03-10 17:27:01 -06:00
bgobandit 4cbe9306ae ishuman 2016-03-07 07:16:21 -05:00
bgobandit 82de663bc8 Shuttle collisions now deal damage to the chest and head for human mobs, gib all other mobs. 2016-02-27 18:13:33 -05:00
Bjorn Neergaard 39421efeb3 Address feedback 2016-02-08 07:22:18 -06:00
Bjorn Neergaard fd5b61a156 Implement robust cargo logging 2016-02-08 04:28:19 -06:00
Bjorn Neergaard 401fe06e1c Fix two small errors 2016-02-08 00:01:54 -06:00
Bjorn Neergaard 4ef2667ff2 Rewrite supply packs/cargo orders 2016-02-07 04:45:55 -06:00
Bjorn Neergaard ddab6823d3 Fix up crates
All shipable crates are proper children
All crates support a manifest
Crates rely on parent code shared with closets when possible
2016-02-07 01:20:37 -06:00
Bjorn Neergaard ede93b63a6 Put shuttles in their proper place, split out secure crates 2016-02-07 01:18:56 -06:00
Bjorn Neergaard 6f05af73a3 Fix shuttles not correctly buying/selling
Empty crates are now sold properly, as well as being sold
only when centcomm is reached
2016-02-06 02:01:38 -06: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 9783f47514 Centralize shuttle computers 2016-02-05 17:06:04 -06:00
tkdrg 7891ac2805 Merge pull request #15034 from AnturK/shuttle_templates
Adds map template datum and size preloading
2016-01-31 13:33:30 -03:00
tkdrg 41fd154e3f Merge pull request #14996 from KorPhaeron/white_ship
Allows you to use the abandoned white ship as an escape shuttle
2016-01-30 01:25:40 -03:00
AnturK 8999db80b4 Fixes shuttles loading improperly in templates
Adds template datum and preloader
2016-01-29 20:51:12 +01:00
KorPhaeron 77330ccd1f Shuttle Launch 2016-01-27 23:17:55 -06:00
Firecage 7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
duncathan salt f92066b478 Fixes whiplash from shuttle docking while buckled 2016-01-23 09:55:23 -06:00
duncathan salt 7cdf700fb8 Compile fix part 1 2016-01-20 08:58:51 -06:00
duncathan b45b9ef363 pipes don't transport air across time and space 2016-01-19 23:14:15 -06:00
Firecage 0cb6814c18 Merge conflict fix 2016-01-17 19:15:30 +02:00
Firecage 754491ce4c Changes relatives paths into absolute paths and makes some if()'s better 2016-01-17 01:36:56 +02:00
AnturK 23efe5f675 Adds a variable to block shuttles from changing destinations midflight for mining shuttle 2016-01-09 17:44:16 +01:00
MrStonedOne fd80575f38 Removes a bunch of sleep(-1) and spawn(-1) from the code
This seems to be causing issues where if the queue was too long, byond would attempt to process through all of it while hanging everything else.
2016-01-04 15:17:12 -08:00
MrStonedOne b50e8d2a63 removes a bunch of unneeded spawns
spawns have a high overhead.

I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
2016-01-02 18:23:02 -08:00
oranges 134a76cc8f Line ending apocalypse 2015-12-17 14:12:37 +13:00
KorPhaeron 32e713b1b3 Doesn't move stuff either 2015-12-15 15:17:04 -06:00
KorPhaeron aeb29a28d0 Shuttle tweaks 2015-12-15 14:33:30 -06:00
AnturK d71e310390 Makes shuttle turf copy use proper helper. 2015-11-25 21:19:36 +01:00
Kyle Spier-Swenson e7341d4384 Fixes shuttle docking ports being acted upon by the singulo
Fixes #12677
2015-11-01 12:03:50 -08:00
Jordie0608 cea729db60 Merge branch 'master' of https://github.com/tgstation/-tg-station into thetitanichadabettersafetyrecordthannanotrasen 2015-10-16 01:14:17 +11:00
Jordie0608 39410d355c ministation pass 2015-10-16 01:01:11 +11:00
Jordie0608 69a6c82654 station placed shuttles demonstration 2015-10-13 21:49:52 +11:00
phil235 8daa8d9075 Fixes some admin buttons in certain admin messages ("move ferry" in the ferry request message, "adminmoreinfo", "antagonist" (to check antagonist) in player panel, 'list_signalers' button in transfer valve opening message).
Fixes Blue space artillery button in Centcom message, nuke code request message and syndicate message.
2015-10-12 02:03:31 +02:00
Jordie 9fbabcc305 Merge pull request #10798 from MrPerson/exceptions_to_help_phil_fix_potential_bugs_and_also_aran_maybe
Change many ERROR() calls into thrown exceptions
2015-07-25 19:22:46 +10:00
MrPerson 471d69fcf7 Change many ERROR() calls into thrown exceptions
This requires a 508 beta version to use. If Travis fails this he's a bitch

Exceptions will generate a stack trace, which is way easier to see and more helpful in actually solving this kind of crap. Also logs all the arguments, src, line, and file automatically.
Removed any dubiously helpful information in the exception names so the runtime condenser won't see each one as a different runtime. If the information is critical to solve these bugs (camera one maybe?), then I'll just make these warnings.
Thrown exceptions crash the currently running proc. Yes that means there's useless returns in a bunch of these, sue me. spawn()'s are to let the proc continue.

Almost all of these are difficult to trigger, but I did test playsound. And frankly even if they do cause bugs by crashing procs, big whoop
2015-07-23 08:19:08 -07:00
MrStonedOne 0aa0bc4141 OH GOD THE RUNTIMES!
fixes shuttles causing atmos runtimes that fill up our runtime logs
2015-07-22 09:49:32 -07:00
MrStonedOne 8418ea6d02 fixes shuttle rotate compile error 2015-07-20 12:08:53 -07:00
MrStonedOne 9108dbba42 Makes shuttle rotate Re-Smooth's atoms if need be. 2015-07-20 12:08:30 -07:00
MrStonedOne 7f58d930bb Shuttle Rotation Tweaks
This should fix shuttle walls not rotating back to their old state correctly when the shuttle docks elsewhere.
Also uses built in procs and caches the calculated rotation angle to improve shuttle docking speed by not calculating it again for every object.
This should also ensure that diagonal objects rotate correctly, rather then snapping back to a cardinal direction.
2015-07-20 04:28:46 -07:00
MrStonedOne 19ef482d87 Finishes carnmc's shuttle rotation feature.
Under carn shuttles, When shuttles dock at a docking port that is not the same direction as them, they rotate their bounding box, and they do magic i don't understand to rotate where the turfs get placed.

But it doesn't rotate the items or smoothwall or handle pixel_xy or any of that.

This fixes that.

Shuttle rotation will call /atom/proc/shuttleRotate(degrees)
Default behavior handles most cases, and overrides handle edge cases.

Shuttle walls don't smooth wall or obey directions, so I just rotate their icon using matrix transform, its dirty but it works.

See: https://tgstation13.org/msoshit/powrightinthekisser.png or https://tgstation13.org/msoshit/fuckingshuttles.png
2015-07-20 04:28:45 -07:00