cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-23 16:03:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,625 Commits 29 Branches 2 Tags
edd4d953846495a8ff29ca358574dfd5b0f2fd21
Commit Graph

23 Commits

Author SHA1 Message Date
PollardTheDragon
4bed17ef31 Adds new trader shuttles for each trader type (#29734) 
* Prepare for trade shuttles

* The ships

* Debug logs

* W i d e

* Adjust

* Update boxstation.dmm

* Templates instead of landmarks, test this

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Fixes

* Removed unnecessary comment

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Null check

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Reorganizes some ships to make viewing easier

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
 2025-08-22 15:10:41 +00:00
CRUNCH
b84ed307e1 Adds a new Emergency Shuttle: The Clockwork Shuttle (#29794) 
* Create emergency_clockwork.dmm

* Praise ratvar!

* Update emergency_clockwork.dmm

* removes a stray light toob
 2025-08-06 06:05:05 +00:00
AmityBlamity
4105bc0e4b Spelling, grammar, and Britishism fixes (#29517) 2025-06-04 11:57:21 +00:00
kyunkyunkyun
2e0e61f463 Fix Lance shuttle (#29191) 
* Update shuttles.dm

* oh i can do this as well
 2025-05-27 20:51:30 +00:00
CRUNCH
7b0a6ec26b Makes the Bar Shuttle Bigger & Better (#28724) 
* Update emergency_bar.dmm

* Update emergency_bar.dmm

* Update emergency_bar.dmm

* Update emergency_bar.dmm

* Update shuttles.dm

* Update emergency_bar.dmm

* Update emergency_bar.dmm
 2025-04-04 15:30:06 +00:00
CRUNCH
9a33a897cb Adds a Brand New Shuttle: NXV Cherenkov (#28776) 
* creation

* You can buy it now

* Added a bunch of piles and stuff

* Update code/datums/shuttles.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update emergency_cherenkov.dmm

* Update emergency_cherenkov.dmm

* Update emergency_cherenkov.dmm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
 2025-03-30 23:22:20 +00:00
Contrabang
781c6e9aa3 Makes shuttles lazy load (#28315) 
* update documentation + names

* shuttle 1

* shuttle 2

* thank god

* undef

* ci fix

* fix ci again

* Fallbacks and stuff

* fixes the lance
 2025-02-26 22:46:27 +00:00
PopeDaveThe3th
f64932f1f3 Shuttle Lore Tweaks (#25790) 
* shuttle lore

* some more lore

* Update code/datums/shuttles.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/datums/shuttles.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/datums/shuttles.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* removes the extra T

* whoops

* Update code/datums/shuttles.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update shuttles.dm

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-07-01 23:14:28 +00:00
Qwertytoforty
2ce4c20515 Adds the Lance emergency shuttle (#24806) 
* WIP: Adds the Lance emergency shuttle

* untodo

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* c-c-c-changes

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* Update code/datums/shuttles.dm

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
 2024-05-15 14:13:51 +00:00
Qwertytoforty
88af37bfcf Adds the NTSS Shadow (#24778) 
* WIP

* change this

* the rest of the fucking owl

* removes QWERTODO

* let us fix the CC beacons too

* makes it look better

* makes CI work on everything but shadow, asking warriorstar

* exclude ntss shadow from window spawner checks

* final changes hopefully

* moved around parts of the shuttle

* Update code/modules/atmospherics/machinery/components/trinary_devices/filter.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* moves it moves it to it's own file

* move it move it

* bobby_drop_tables

* oops

* fuck

---------

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-04-26 22:31:09 +00:00
Qwertytoforty
9096c5f0b9 Ports the NTSS Raven from TG station. Slightly remaps delta escape / faragus escape (#24567) 
* R A V E N

* docking ports. Delta needs  tweak

* yep

* raven generators, increased range / anchored

* names / fixes wrong generators

* decore / missing decal

* NTSSS RAVEN

* purge this

* oops

* should be good

* Update code/modules/mob/living/simple_animal/friendly/mouse.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-21 21:21:56 +00:00
Luc
2ee1b06936 Purchasable Emergency Shuttles (Ready for review) (#23701) 
* basic framework

* Moves shuttle loading out to subsystem

* work out most of the ordering logic

* better whitelisting

* shuttle speed factor is a thing now

* Better speed factor, renaming

* try to fix some typing issues

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Fixes some issues with multiple shuttle orders

* add some basic prices

* more minor price adjustments

* Add cmag support

* order of ops

* Update code/controllers/subsystem/SSshuttles.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Make necessary tgui tweaks

* Whitespace suggestions

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/controllers/subsystem/SSshuttles.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* addresses some review concerns

* remove todo

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/controllers/subsystem/SSshuttles.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* ahh eto

* cleaned up as per discord

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-03-11 17:12:06 +00:00
S34N
f9a55dbbd8 Various shuttle fixes, new shuttle type (#19378) 
* shuttle fixes

* bamboo

* nocreep grass

* windows
 2022-11-09 23:37:19 -06:00
AffectedArc07
1c8a28425a Removes heist mode & associated code (#17256) 2022-01-11 11:36:57 +01:00
TDSSS
19dcb033c3 Initial commit 2020-08-25 20:19:25 +02:00
AffectedArc07
35cdc641b2 Unit Test For Invalid Map Templates 2020-07-25 18:09:57 +01:00
EvadableMoxie
5c2608330c Adds Nanotrasen Hospital ship, admin shuttle templates system. 2019-05-02 20:17:50 -04:00
Kyep
6c960eeaf3 Adds Mil Alt Escape Shuttle (Troop Transport) 2017-07-26 02:40:18 -07:00
Kyep
7b481ed13d Adds dept shuttle 2017-06-08 01:08:19 -07:00
Aurorablade
dee83ef62e ALL HAIL LEMONS 2016-09-22 02:00:04 -04:00
Aurorablade
a2a96843ea wtf am i even doing anymore... 2016-08-11 01:36:28 -04:00
Aurorablade
79c9b690ac EVERYBODY HURTS 2016-08-03 23:51:13 -04:00
Aurorablade
9735ff78ac shuttles 2016-07-28 23:47:05 -04:00