Commit Graph

107 Commits

Author SHA1 Message Date
Joan Lung
8e4df5607b Singularities, but not gods, are now stronger than shuttles 2016-07-26 09:18:41 -04:00
Kyle Spier-Swenson
4a50869c11 Increases shuttle delay to 5.5+10 seconds (#19347)
1+5 seconds was super lame.

The delays had code related reasons, call time at the least shouldn't ever be below 10 seconds without editing the animation for the hyperspace ripples.

The ignition time is designed to make reserving transit space easier, and if it is ever full, ignition time rate limits how often it attempts to reserve transit space.

There isn't actually enough transit space for all of our shuttles (because their doesn't need to be 99% of the time) but with a call time only 1 second, the syndicates, the miners, security/gulag, people using the white ship, and admins could all spam call their related shuttles and then now you have a case where 1 or 2 shuttles are calling the proc to check for transit space every minute. add on the escape shuttle docking and cargo shuttle docking at that moment, and that number could jump to 4 shuttles trying to reserve transit space every minute, all needlessly.

Also, https://tgstation13.org/phpBB/viewtopic.php?f=10&t=7286&view=unread#p195824 points out that having ignition time too long causes issues. I'd want there to be enough time that when we make ignition more apparent, there is actually time react.
2016-07-18 15:49:57 +12:00
KorPhaeron
251b2dc372 Shortens shuttle time from 25 to 6 seconds 2016-07-13 21:20:30 -05:00
Joan Lung
71da2aba13 Fixes shuttles killing AI camera eyes (#19280)
* this wasn't even my bug but because mso was an ass I fixed it for him

* spitefronds
2016-07-13 12:50:20 +12:00
coiax
43e78b8e5e Shuttle bombs now make transit space turfs (#19171)
🆑 coiax
fix: Damage to a shuttle while it is moving will now correctly make
transit space turfs, rather than non-moving space.
/🆑

This also makes explosions on lavaland more sane. The mining shuttle
exploded while on lavaland will make ordinary rock, while the gulag
shuttle will expose lava.
2016-07-07 08:04:54 -04:00
Jack Edge
bb110a004d Remove transit when not in use
Now with pretty colors!
2016-07-02 21:29:29 +01:00
Jack Edge
9f9fd6efcd Merge branch 'master' into dynamic-transit 2016-07-02 11:57:32 +01:00
Jack Edge
1ad915beed Now working, let's do this 2016-07-02 00:03:04 +01:00
Jack Edge
0f67b846df Replaces travelDir with port_angle 2016-07-01 16:55:19 +01:00
Jack Edge
8b8a10410f Removes zombie shuttle ripples
The qdel timer was interacting weirdly with the pool. This makes it
stop.

Fixes #19021
2016-07-01 10:42:52 +01:00
Jack Edge
d0a2225e64 Functioning with bugs 2016-06-30 15:50:29 +01:00
Jack Edge
3c022aa0d1 Wheeee 2016-06-30 13:24:05 +01:00
Jack Edge
c2108a9af5 At this point it's turning into more a rewrite 2016-06-30 00:05:26 +01:00
Jack Edge
d770fd8b2d Is anything real anymore 2016-06-29 20:37:32 +01:00
Jack Edge
32d29d7222 Experiments will continue until performance improves 2016-06-29 11:14:15 +01:00
Jack Edge
0d0c42fc6a Compilation 2016-06-28 13:04:43 +01:00
Jack Edge
a09544992c Merge branch 'master' into shuttle-processing
Conflicts:
	code/modules/shuttle/ripple.dm
2016-06-26 01:00:25 +01:00
Jack Edge
86cc2dd09a Ripples are overlay/temp 2016-06-25 18:18:44 +01:00
Jack Edge
e1b7ef1cba Changes default shuttle transit time to 15 seconds
🆑 coiax
rscdel: The default shuttle transit time is now
15 seconds.
/🆑

- Fixes shuttle movement spam to spam stun
- Guarantees that all shuttles produce the full
ten second ripple effect before appearing
2016-06-24 10:16:27 +01:00
Jack Edge
a673ba8a75 Removes spawn() 2016-06-19 00:11:34 +01:00
Jack Edge
2d4272612c Roadkill only affects affected turfs 2016-06-18 23:40:13 +01:00
Jack Edge
b67726f896 Code review 2016-06-18 23:08:27 +01:00
Jack Edge
68a67e2227 Adds visible ripples indicating shuttle's transit
🆑 coiax
rscadd: Due to budget cuts, the shuttle's hyperspace engines now create
a visual distortion at their destination, a few secons before arrival.
Crewmembers are encouraged to use these "ripples" as an indication of
where not to stand.
/🆑

- Adds a new layer RIPPLE_LAYER, above vines, below ghosts
- Ripples appear at 10 seconds (the engines online time) and fade in
from fully transparent to fully visible during that time.
2016-06-18 21:30:02 +01:00
Kyle Spier-Swenson
2be36ce8cc fixes shuttle rotation 2016-06-12 18:26:34 -07:00
Remie Richards
b3b60b187b Manual repair of some edge cases. 2016-06-11 23:11:54 +01:00
Remie Richards
fda2c699fc Automatic conversion via Regex 2016-06-11 18:37:48 +01:00
Nerd Lord
f653f38418 it's literally just to make protector holos marginally fancier under 'hit by shuttle' conditions 2016-06-03 17:35:54 -04:00
Nerd Lord
10520995a2 Slightly improves shuttle crushing 2016-06-03 17:19:09 -04:00
Jack Edge
5c82b8eae0 Mobs only take damage once from a shuttle roadkill
Fixes #18061.

🆑 coiax
bugfix: You can only be damaged once by a shuttle's arrival. It is still
unpleasant to be in the path of one though; try to avoid it.
/🆑
2016-05-31 04:31:08 +01:00
coiax
4483d5275c Shuttle manipulator (#17436)
* Starting out on our tgui journey

* God tgui, why do you need to be updated

You're dynamically generated anyway

* Commit of stuff

* Further progress is being made

* Everyone loves buildscripts

* Further modifications to my incredible running script

* Starting to modify the minimap code to be better

* It's going well thusfar, I guess

* What have I done

* RIP minimap

* FUN FUN FUN FUN FUN

* Adds shuttle_manipulator.dmi

MUH HOLOGRAMS

* Is it done? IS IT OVER

* Peer review

* Some bug fixes

* Makes that damn greentext shut up

* Shuttle registration

* Made the Emergency Escape Bar more robust

No climbing on the bar.

* Do not stare into the operation end of the device

* Compile shame

* THE MOST DUMB

* Passive barmaiden

* Emergency shuttle memes

* MORE SAFETY CODE

* Fancy shuttle manipulator icons

* Smoothing it out

* We are going to have a lot of fun with this one

* Independent blobbernauts

* WABBAJACK WABBAJACK

* Message for attempting to authenticate old style

* Angry alert noise is back

* Revert "Independent blobbernauts"

This reverts commit 34d6af7c9c88cfc2864990cb37b586bb90163dd3.

* No parrot sleep plz

* Moves the special shuttle stuff to special.dm

* No Bartender like a Centcom Bartender

* Non-controversial map changes

- Backup shuttle moved closer to Centcom main structure, docking tube
created
- Moved shuttle import landmark to above Centcom main building
- Added shuttle displays to Conference Room
- Squashed the Chapel a bit in Metastation
- Made the docking port on Z2 massive
- Made the docking port on Metastation a lot larger

* Hacks and slashes at Box

A bunch of things are extended and squashed so Box shuttle dock can
support the MetaStation emergency shuttle.

* Some Metastationshit

* Never ending changes

* Wabbajack to TGM

* Modified the bar, I think that's all of them

* Stops Barmaiden wandering around

* More code review

* Whitspace, the bane of us all

* DIE WHITESPACE DIE
2016-05-26 15:15:19 +02:00
Iamgoofball
9f57bca8f7 Adds two alternate shuttles (#17592)
* I got the results of the test back - I definitely have breast cancer.

* aaaaaa

* need help translating shuttle code, will pay in shitcode

* fixes

* Update emergency_imfedupwiththisworld.dmm

* Removes copyright infringement

* Update shuttles.dm
2016-05-14 19:06:25 -05:00
coiax
5b5d956943 Alternate escape shuttles and ferries (#16761)
* Added a simple bar-theme escape shuttle

Features include a very tough Bardrone, with laws to be a good
bartender, bathroom, a quality lounge for the heads, and a small
gambling table.

* Changed drone's health to 3000

Bardrone is now strong, to cope from stray gunfire.

* Replaces banned variables with alternates

Step_[xy] is bad, mkay?

* Added STV5, the cramped transport shuttle

Well, looks like Centcom only had this ship ready for evacuation. I hope
you're friendly with your coworkers!

* Removed shuttle area from empty space on STV5

* Added cult shuttle

Looks like this automated shuttle may have wandered into the darkness
between the stars on route to the station. Let's not think too hard
about where all the bodies came from.

* Include the Narnar Shuttle

* Meat ferry added

Very basic, could probably use some love from a map wizard.

* Moved shuttle files to shuttles/ directory

* MAPS MOVED AND RENAMED

* Hyperfractal Gigashuttle

"I dunno, this seems kinda needlessly complicated."
"This shuttle has very a very high safety record, according to Centcom
Officer Cadet Yins."
"Are you sure?"
"Yes, it has a safety record of N-A-N, which is apparently larger than
100%."

* I REGRET ADDING THESE

* Into templates you go

* Changed floors

* Hugbox supermatter, for map making

* Shuttles KINDA delete themselves

* Hats in hats in hats in hats in hats

* Use the hugbox supermatter in the shuttle

* Include the new verbs

* Include our new verbs

* Fixed runtime when deleting emergency shuttle

* Added to verb list

* Fixes more runtimes with deleting the shuttle

* Shuttle Destroy verb now functions

* Moved them out of the shuttles/ folder

* We'll need these docks later

* shuttle_import landmark datum made

* Changes z2 to TGM format and adds shuttle_import landmark

* SHUTTLE IMPORT VERB

Is this it? Are we there?

* Some compile fixes

* Emergency bar map updated

* Updated cramped shuttle

* Updated narnar shuttle

* Supermatter shuttle updated

* Meat ferry updated

* Debugging information included

* Debug code, QDEL hints

* Minor updates to collection of maps

* May as well use the snowflake drone code

PICK YOUR OWN BARKEEPING HAT.

* The Lighthouse

*static*... part of a much larger vessel, possibly military in origin.
The weapon markings aren't anything we've seen ... *static* ... by
almost never the same person twice, possible use of unknown storage ...
*static* ... seeing ERT officers onboard, but no missions are on file
for ... *static* ... *static* ... *annoying jingle* ... only at The
LIGHTHOUSE! Fulfilling needs you didn't even know you had. We've got
EVERYTHING, and something else!

* Made supermatter hallucination too powerful

* Added force argument for docking testing

* Added emergency backup shuttle

Hopefully it will never be seen or used. But means that provided it's
there and untouched, even with the accidental deletion of a shuttle,
round will still be able to end as normal.

* Added templates for existing shuttles

* Backup shuttle used if emergency shuttle deleted

* Added backup shuttle transit space

Don't know why transit spaces aren't dynamically generated, to be
honest.

* Hyperfractal Gigashuttle improved

More radiation lockers, chairs which makes it "safer".

* Added Shuttle Under Construction

The documentation hasn't been finished yet for this shuttle. Break glass
in case of emergency.

* Added warnings for shuttle interaction

ARE YOU SURE YOU WANT TO DELETE THE EMERGENCY SHUTTLE?

I mean, I really don't know what will happen, and it's probably
nothing good.

* Snappop(tm)!

Hey kids and grownups! Are you bored of DULL and TEDIOUS shuttle
journeys after you're evacuating for probably BORING reasons. Well then
order the Snappop today! We've got fun activities for everyone, an all
access cockpit, and no boring security brig! Boo! Play dress up with
your friends! Collect all the bedsheets before your neighbour does so!
Check if the AI is watching you with our patent pending "Peeping Tom AI
Multitool Detector" or PEEEEEETUR for short. Have a fun ride!

* Fixed horrific experiment icon, added gambling spawner

* Candle changes

Infinite candles start fires but don't run out.
Infinite candles don't make messages when created.

* Shuttle can dock if already docked

* Fixing bugs with shuttle import

Also, some minor bugs with hugbox supermatter still consuming
gas moles and slowly depressurising the area.

* Admin notice, unload bad template

* Fixes problems with some shuttles

* Warning message if roundstart dock failed

* Compiles.

* Inform admins of shuttle problems

* Names for shuttles, minor tweaks

* Moved shuttle templates to shuttles/

* Version numbers are lame

* Shuttle datums

* Shuttle manipulator barebones

It doesn't do anything at the moment.

* Added shuttle manipulator to Z2

It still doesn't do anything yet, but it looks pretty.

* Use GetAllContents(), don't delete ghosts

* Fixes bug where nothing would actually load

* Cancel button on Destroy Shuttle

* Fixed birdboat shuttle overwriting bar shuttle
2016-05-07 23:35:57 +02:00
phil235
750eaa4a57 invisibility = 100 and 101 now use defines. 2016-04-29 01:00:05 +02:00
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
xxalpha
688137c7dc icon smooth ss
adjustments

adjustements

atharrachaidhean
2016-03-12 23:57:45 +00: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
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