Commit Graph

204 Commits

Author SHA1 Message Date
Jordan Brown
7c3160aef1 Makes a thing use its macro (#38556) 2018-06-19 09:38:43 +01:00
Jordan Brown
065485440f Merge pull request #38527 from AutomaticFrenzy/patch/ripples
Fix ripples appearing too broadly and disappearing too soon
2018-06-17 17:12:22 +01:00
Tad Hardesty
6332cabfe8 Merge pull request #38098 from kevinz000/transit_space_refactor
Transit space refactor
2018-06-16 20:41:21 +01:00
Emmett Gaines
b5e6b31976 Fixes jumpToNullSpace (#37442)
woops
2018-04-27 19:05:55 +01:00
Emmett Gaines
1bf63de4e8 Removes some unnecesary vars on shuttles (#37041)
* Removes some unnecesary vars on shuttles

* Forgot to reapply unused transit turf flag
2018-04-12 11:43:13 +01:00
kevinz000
d17b8f3dc2 Shuttle garbage collection (#36871)
* Shuttle garbage collection

* istype
2018-04-08 17:34:09 +02:00
Emmett Gaines
d6a8500495 Shuttles have additional baseturfs, and other minor baseturf changes (#36388)
cl ninjanomnom
fix: Shuttles have proper baseturfs now.
fix: Mineral walls properly use their baseturfs when destroyed/drilled.
add: A new engineering goggle mode allows you to see the shuttle area you're standing in.
admin: Buildmode works a bit better with baseturfs now and can properly only remove the top layer of turfs when editing. Note that as a result the order you place turfs is important and a wall placed on space means when the wall is removed there will be space underneath.
/cl

This adds an area hook for turfs getting the PlaceOnTop proc called so shuttle areas are able to intercept it and add a special turf used for determining where the bottom of the shuttle is. I'm not too certain on this being the best way to handle it but the alternatives restrict the kind of turfs that are allowed to be on shuttles which I didn't want to do as it was part of the whole intent of the baseturf change to allow any turf type on shuttles.

The alternative to the area hook would require a tool which attaches turfs to a shuttle which is why there's a shuttle area viewing tool in this pr. I considered doing it this way first but decided it was too clunky.

In addition to other changes:

Tiled/Reinforced floors have proper baseturfs now.

A large amount of the remaining ChangeTurf calls were swapped over to various baseturf helpers so, for example, mining doesn't create a lavaland turf if somehow the mineral wall is on plating.

Escape pods, the aux base, and syndicate drop pod have been converted over to shuttle templates as well.

The error when the timid var is set incorrectly has been changed to a stack_trace.

The change turf file has been made all lowercase as per standard.
2018-04-05 00:14:05 +01:00
Emmett Gaines
8174eaf2e1 Improves the shuttle error to include jump links and destination (#36305) 2018-03-10 18:52:29 -05:00
coiax
8e20aa3f7b Refactors shuttles to be loaded in, rather than be on the station maps (#33766)
* Refactors shuttles to be loaded in, rather than be on the station maps

- Shuttles are now loaded in by the shuttle subsystem.

You configure what shuttles are loaded in via
`/obj/configuration/shuttle_load` objects.

* Box arrivals shuttle is now imported from template

* Moves things out of the #ifdef

* Box emergency shuttle is now imported

* Box emergency shuttle is now templated

* Box ferry and whiteship now load from template

* More shuttles on Box done

* Apart from the pods, Box is now completely templated

* Delta now has all non-awkward shuttles loaded in

And Centcom..

* Removes no ops turfs, more error messages

* Fixes slightly chopped off external wall

* Massaging more shuttles into working correctly

* Debug messages are king

* Delta cargo shuttle now docks again

* First pass of Metastation shuttles

* Omegastation first pass

* Metastation now has its own shuttle

* Did most shuttles on Pubby

* Turns out Pubby arrival shuttle is slightly smaller than Box arrival

* Whoops, missed a stationary port

* TGMified the pubby arrival shuttle

* First pass, box is working

* All stations now have roundstart_template and no configuration objects

* Removes roundstart_move

* Why do we even have these unused keys

* Remove unused coded vars

* removes some excessive safety checks

* Missed some Centcom cargo dock stuff

* Got it working again

* That thing that Cyberboss wanted

* Noop turfs the shuttle templates

* And template noop for the area

* Attempts to assuage travis

* Warning!

* Please love me, Travis

* RIP Remie
2018-01-25 15:18:15 -05:00
MoreRobustThanYou
5bc77ea0bc Shuttles will now throw you when taking off
🆑 SPACE CONDUCTOR
tweak: Shuttles will throw you around if ya don't buckle in
/🆑
2018-01-25 09:15:10 +13:00
Emmett Gaines
c206c0cc68 lets check_dock be silent (#34614) 2018-01-21 19:34:17 +01:00
Tad Hardesty
f2dbe5cf13 Replace explicit z-level checks with defines (#33829)
* Replace explicit z-level checks with defines

* Rename turf_z_is_planet for consistency

* Use TRUE/FALSE in onSyndieBase
2017-12-29 14:40:06 -05:00
Emmett Gaines
4595c46dca turns the baseturf var into a part time list (#33705) 2017-12-25 20:10:08 -05:00
Emmett Gaines
ca603a6db4 a new file for dock and its new fractured existence (#33627) 2017-12-18 21:24:48 -06:00
Emmett Gaines
25080ff2c4 defines math (#33498) 2017-12-17 11:02:11 -05:00
Cruix
ac1fbcc858 Fixed several bad type checks in shuttle procs (#33497) 2017-12-13 22:08:30 -05:00
Jordan Brown
f91c577863 Merge pull request #33457 from ninjanomnom/check-your-tick
Check ticks some more in dock()
2017-12-12 13:58:03 -05:00
ninjanomnom
bef7ed41d3 nothing happened 2017-12-11 13:06:34 -05:00
ninjanomnom
9462eb18d8 check tick before onMove 2017-12-11 05:48:40 -05:00
Emmett Gaines
7848d73acc minor improvements (#33424) 2017-12-10 18:44:00 -05:00
Cruix
05d7402bad Allowed shuttle docking ports to be hidden from some shuttle docking computers (#33148)
Added a delay to the white ship shuttle docking computer designating a landing spot
2017-12-11 09:22:48 +13:00
ninjanomnom
327727f70c allows for qdel in shuttleMove procs 2017-12-07 22:37:30 -05:00
ninjanomnom
761c02ba45 old turf in afterShuttleMove 2017-12-05 16:00:16 -05:00
Emmett Gaines
17180f1f0e custom docker improvements (#32626) 2017-11-24 12:44:12 +01:00
Emmett Gaines
7c69cdcb8a Revert math (#33059)
* Revert "all this wrapping and it's not even christmas (#33035)"

This reverts commit faaf151580.

* Revert "fuck me for forgetting to graph this one"

This reverts commit 45d7acea2f.

* Revert "defines math"

This reverts commit 2817a1737b.
2017-11-23 20:59:52 -05:00
ninjanomnom
2817a1737b defines math 2017-11-22 17:36:58 -05:00
ShizCalev
12b8daa02b Fixes incorrect to_chat usage 2017-11-18 23:09:10 -05:00
Emmett Gaines
3934a84249 fixes shuttle parallax again (#32350) 2017-11-03 16:22:48 -04:00
oranges
2bd56ab358 Merge pull request #32269 from ninjanomnom/cargo-shuttle-moblock
Makes enterTransit check canMove and sets mode to idle
2017-11-02 09:51:45 +13:00
Emmett Gaines
4d420b8975 Shuttle rotation refactor and significant performance upgrade (#31942)
* Shuttle rotation refactor

* cleanup

* fixes the air leak bug

* Updates the turf decal component and cleans up some code

* transfercomponents and some list optimization

* Makes turf_decals cleanable in theory

* review cleanup

* final cleanup: decals work
2017-10-31 21:23:17 -04:00
ninjanomnom
dc359635ca Makes enterTransit check canMove and sets mode to idle 2017-10-30 17:54:08 -04:00
Emmett Gaines
13ab4f55d9 Next round of shuttle fixes at the cost of a small piece of my sanity (#31784)
* shuttle bugs begone

* cleanup
2017-10-17 19:00:10 +02:00
Cruix
8d4a9b832e Fixed the shuttle navigation computer allowing you to move docking ports (#31721)
* Fixed the shuttle navigation computer allowing you to move stationary docking ports

* Moved a var from stationary docking ports to mobile docking ports

* Removed a sanity check
2017-10-16 22:01:01 -06:00
AnturK
a001f58480 _1 2017-10-12 08:08:10 +02:00
AnturK
1df4082525 Fixes ruins spawning over shuttle docks 2017-10-11 22:46:50 +02:00
ninjanomnom
df54e07ff7 only moving turfs gib/destroy things 2017-10-08 08:30:12 -04:00
Firecage
ee3e8d2846 merge conflict fix 2017-10-05 11:22:57 +02:00
Firecage
2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +02:00
Emmett Gaines
e16fd1b151 Makes shuttle movement a bit smoother and faster (#31255)
* uses CHECK_TICK where it's acceptable

* cleanup
2017-10-05 09:30:32 +02:00
Emmett Gaines
6573100acf fixes shuttles creating duplicate area types (#31008) 2017-09-26 14:25:52 +02:00
Jordan Brown
512889e5c3 Merge pull request #30697 2017-09-14 12:25:09 -04:00
Emmett Gaines
67e284cd4f multi-tile object fix (#30674) 2017-09-14 09:19:20 +02:00
ninjanomnom
9f0b6c7073 fixes transit parallax 2017-09-13 13:10:43 -04:00
KorPhaeron
10a3238fd6 Makes the station Z level into a list instead of a single define (#30297)
* Makes Station Z Levels a global list

* Things didnt get committed

* Define

* Removes files

* Fix mind.dm

* Wrong list name

* (

* Fixes rev checks and signpost

* Makes it actually compile

* Signpost fix

* I hate these sign posts

* Never use the web editor
2017-09-11 13:39:52 -04:00
AnturK
e5fc9b1e94 Fixes shuttle name on ramming. 2017-09-06 10:36:23 +02:00
Jordan Brown
63593226be Changes shuttle port direction var from an angle to a dir (#30167)
* Converts port_angle to port_direction

* Remove old ass comment
2017-09-05 09:41:28 -05:00
AnturK
99a421491f Fixes BYOS (#30356)
* Fixes BYOS

* Uses defines on dock checks.
2017-09-03 11:46:11 -03:00
ninjanomnom
477bc11aa2 Removes the double loop 2017-08-28 16:31:16 -04:00
Cruix
3274ad4f12 The syndicate shuttle can now fly anywhere on the station z-level (#29909)
* Updated advanced camera consoles to be more generic

* Renamed /obj/machinery/computer/camera_advanced/proc/EjectUser() to /obj/machinery/computer/camera_advanced/remove_eye_control()

* Added shuttle nagivation computers

* Added the syndicate shuttle computer to maps
Fixed missing icons
Fixed compile error

* Made jumpto_ports use hashset behavior

* Added qdeleted checks
2017-08-22 10:36:43 +12:00
Emmett Gaines
03eca85d6f Slight on_move.dm rewrite (#30020)
* Minor on_move.dm rewrite

Makes it easier to implement new args
Makes stationary docks move as intended
Some cleanup

* Removes the defines
2017-08-22 09:37:07 +12:00