Commit Graph

60 Commits

Author SHA1 Message Date
Nich
5fbca572ab Fix a typo in scrapheap shuttle description (#39480) 2018-07-31 14:30:12 -07:00
WJohn
c67a698c7e Meta whiteship redesign (#39438)
Redesigned the white ship for metastation, this one's a salvage/cargo vessel!
The salvage pod is currently missing, however, as it doesn't work right now.
I'll add it further down the line. This ship is also filled with a few syndies
protecting it, one of them is ranged, the others are unarmed melee.
2018-07-29 22:37:59 -07:00
WJohn
fd70855a81 Updates the caravan space ruin. (#39182)
* Updates the caravan ruin to remove some of its equipment and re-add the 2nd fighter ship as was originally intended.

* Airlock naming, changed office chairs in dropship to shuttle chairs because they got flung whenever it took off.

* Removes the 2nd syndicate fighter as ninjanomnom will design a better system for it at a later date.

* Renames syndicate fighter to "shiv"
2018-07-18 18:46:51 -04:00
Jordan Brown
d631a0ded0 Merge branch 'pr-38513'
Signed-off-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2018-07-03 13:54:36 -04:00
Denton
23a1bdb8c0 sponsored by Carls Jr. 2018-07-02 20:40:53 +02:00
ninjanomnom
202df9ebb3 Makes racks prevent throws as well 2018-06-19 18:13:57 -04:00
ninjanomnom
c46dda0e4e Shuttle throwing applies to all objects as opposed to just mobs 2018-06-19 18:13:57 -04:00
Dax Dupont
567a14bef3 Some minor pubby shuttle tweaks (#38489)
* Some minor pubby shuttle tweaks

* no step

* Good idea denton

* thanks guys
2018-06-15 20:59:55 -07:00
Tad Hardesty
94759a836b Fix Snowdin elevators and piping (#38184) 2018-06-08 20:25:34 +02:00
pubby
284c961578 Update PubbyStation 2018-05-07 14:03:24 -05:00
Emmett Gaines
ee3446eb7c Templates the caravan ambush ruin shuttles (#37474) 2018-04-29 11:07:39 -04:00
Emmett Gaines
166e001950 Various minor arena shuttle fixes (#37012) 2018-04-09 11:37:22 +02:00
Emmett Gaines
11ba45f708 Makes the pirate ship use a proper shuttle template (#37006) 2018-04-09 11:36:34 +02:00
81Denton
76aeaece4c Gives Omega its own arrivals shuttle (#37043)
* adds arrival shuttle to omega

* anchors closets, removes dv

* moves DS poster 1 tile south
2018-04-09 00:50:25 -04:00
Emmett Gaines
49d1e9ee66 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 11:13:20 +12:00
oranges
b1f301b39b Revert "Adds the saltmine shuttle. (#35369)"
This reverts commit c7ee29b5b0.
2018-02-08 01:49:57 +00:00
Dax Dupont
c7ee29b5b0 Adds the saltmine shuttle. (#35369)
* Adds the saltmine shuttle

* Adds an orange, makes the revolver a reverse one

* henk

* honker

* pay me

* more cat and cat accessories

* memes

* Crybabies jeeez

* Salt is expensive

* There now it's an easter egg shuttle

* nani
2018-02-07 15:16:54 +02: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
Dax Dupont
5927cbe9fd Adds disco inferno shuttle. (#33230)
* Adds disco inferno shuttle

* step be gone

* Minor wall replacement

* Add no diagonal walls

* Made the dance machine all access

* Makes the statues work as I originally intended in this shuttle

* Fixes a chair

* Changed door and made it to keep fire inside.
2017-12-05 03:10:31 -05:00
swindly
d3df913402 fixes spelling and stuff (#32531) 2017-11-09 11:03:50 -06:00
shizcalev
22764665c9 CentCom Standardization 2017-08-07 19:04:27 -04:00
AnturK
0c3edf1ff7 Shuttle engines affecting travel time (#28564) 2017-06-25 22:52:06 -03:00
MMMiracles
c98ca85fb4 Cerestation Tweaks VI: Shuttle Edition (#27045)
* Added a new escape shuttle design for Cerestation. Holds over 80 people with several fully-stocked sub-departments for people to kill themselves with at the end of the round.
* Added a new white shuttle design for Cerestation. Meant mostly as a cargo vessel for transporting materials during the station's construction. Comes with a spawner that has a 75% chance to spawn ripley wreckage or 25% chance to spawn a fully-equipped ripley.
2017-05-09 12:39:13 -03:00
Mr Potato Shaman
b2bea58273 Now Beepsky's impact will be grammatically correct. 2017-05-07 17:02:37 -05:00
Cyberboss
9e1ef0ffe2 Global variable wrappers (#25325)
* Add the system for managed global variables

* Travis ban old globals

* So you CAN inline proccall, that's neat

* Fix that

* master.dm

* Remove the hack procs

* Move InitGlobals to the proper spot

* configuration.dm

* Fix the missing pre-slash

* clockcult.dm

* This is probably for the best

* Doy

* Fix shit

* Rest of the DEFINES tree

* Fix

* Use global. for access

* Update find_references_in_globals

Always hated that proc

Whoever made it must've bee a r e a l idiot...

* __HELPERS tree

* Move global initialization to master.

Fix the declaration

* database.dm

* Dat newline

* I said DECLARATIVE order!

* Here's something you can chew on @Iamgoofball

* game_modes.dm

* Fix this

* genetics.dm

* flavor_misc.dm

* More stuff

* Do it mso's way. Keep the controllers as global

* Make master actually see it

* Fix

* Finish _globalvars/lists

* Finish the rest of the _globalvars tree

* This is weird

* Migrate the controllers

* SLOTH -> GLOB

* Lighting globals

* round_start_time -> ticker

* PAI card list -> pai SS

* record_id_num -> static

* Diseases list -> SSdisease

* More disease globals to the SS

* More disease stuff

* Emote list

* Better and better

* Bluh

* So much stuff

* Ahh

* Wires

* dview

* station_areas

* Teleportlocs

* blood_splatter_icons

* Stuff and such

* More stuff

* RAD IO

* More stuff and such

* Blob shit

* Changeling stuff

* Add "Balance" to changelogs

* Balance for changelog compiler + Auto Tagging

* Update the PR template

* hivemind_bank

* Bip

* sacrificed

* Good shit

* Better define

* More cult shit

* Devil shit

* Gang shit

* > borers

Fix shit

* Rename the define

* Nuke

* Objectives

* Sandbox

* Multiverse sword

* Announce systems

* Stuff and such

* TC con

* Airlock

* doppllllerrrrrr

* holopads

* Shut up byond you inconsistent fuck

* Sneaky fuck

* Burp

* Bip

* Fixnshit

* Port without regard

* askdlfjs;

* asdfjasoidojfi

* Protected globals and more

* SO MANY

* ajsimkvahsaoisd

* akfdsiaopwimfeoiwafaw

* gsdfigjosidjfgiosdg

* AHHHHHHHHHHHHHHHHHHHHHHH!!!!!

* facerolll

* ASDFASDFASDF

* Removes the unused parts of dmm_suite

* WIP

* Fix quote

* asdfjauwfnkjs

* afwlunhskjfda

* asfjlaiwuefhaf

* SO CLOSE

* wwwweeeeeewwwww

* agdgmoewranwg

* HOLY MOTHER OF FUCK AND THATS JUST HALF THE JOB?!?

* Fix syntax errors

* 100 errors

* Another 100

* So many...

* Ugh

* More shit

* kilme

* Stuuuuuufffff

* ajrgmrlshio;djfa;sdkl

* jkbhkhjbmjvjmh

* soi soi soi

* butt

* TODAY WE LEARNED THAT GLOBAL AND STATIC ARE THE EXACT SAME FUCKING THING

* lllllllllllllllllllllllllllllllllllllllllll

* afsdijfiawhnflnjhnwsdfs

* yugykihlugk,kj

* time to go

* STUFFF!!!

* AAAAAAAAAAAAAAAAAHHHHHHHHHHHHHHHHHHHHHHHHHHH!!!!!!!!!!!!!!!!!!!!!!!

* ngoaijdjlfkamsdlkf

* Break time

* aufjsdklfalsjfi

* CONTROL KAY AND PRAY

* IT COMPILEELEELELAKLJFKLDAFJLKFDJLADKJHFLJKAJGAHIEJALDFJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

* Goteem

* Fix testing mode

* This does not belong in this PR

* Convert it to a controller

* Eh, fuck this option

* Revert controllerization Ill do it some other time

* Fix

* Working controllerization

* FOR THE LOVE OF CHRIST PROTECT THE LOGS

* Protect admins and deadmins

* Use the inbuilt proc
2017-04-06 23:26:13 -06:00
Haevacht
ed5990a8e3 Cutsier -> cruiser. (#25017)
robustin is more intrested in pointing out how much he tests rather than fixes honk also i would give it a 1% chance to always be cutsier but i am LAZY
2017-03-13 03:25:35 -04:00
Tofa01
02bbad3656 Adds The Centcomm Raven Battlecruiser, A New Purchasable Emergency Escape Shuttle (#24572)
* Adds new escape shuttle.

* Changes shuttle docks slightly to allow for longer ship docking.

* Replaces step with pixel

* Fixes areas

* uses map merger on pubby (Forgot)

* BATTLECRUISER MODE

* dammit step_ why do you exist

* Increases cost of shuttle

* Removes pointless anomaly check

* Fixes door to space on omegastation

* PLASMA

* Makes turrets more robust.

* Adds some windows. FINISHED!
2017-03-03 22:57:57 -06:00
coiax
5ada415e70 Makes the Hyperfractal Gigashuttle purchasable for 100,000 credits (#23797)
🆑 coiax
add: The Hyperfractal Gigashuttle is now purchasable for 100,000
credits. Help Centcom by testing this very safe and efficient shuttle
design. (Terms and conditions apply.)
/🆑

Because it costs a lot, and people loved it back then, they will love it
now. And it'll actually take a LOT of effort to buy, given the cost.
2017-02-15 22:51:03 -06:00
Cheridan
da77946b2a Merge pull request #23963 from RandomMarine/dontgetrektcomrade
Mother Russia Bleeds shuttle.
2017-02-12 04:05:32 -06:00
coiax
e4e192c3a3 BYOS shuttle restrictions (Shuttle changes #1) (#23904)
* BYOS shuttle restrictions (Shuttle changes #1)

🆑 coiax
add: The Build your own shuttle kit can only be bought in the first five
minutes of the shift.
/🆑

- BYOS restriction is to avoid grief.

* Moves the defines

* Ten minutes
2017-02-12 14:13:44 +13:00
oranges
90c3b06bbd Merge pull request #23905 from coiax/shuttles-3
Removes shuttle STV5 from purchase (Shuttle changes #3)
2017-02-12 14:13:26 +13:00
RandomMarine
f663e54dd2 Adds Mother Russia Bleeds shuttle 2017-02-10 22:08:58 -08:00
KorPhaeron
f1374d1730 Merge branch 'master' into theworstshuttle 2017-02-10 11:27:34 -06:00
coiax
4f43d0d42b Reduces cost of NES Port shuttle (Shuttle changes #5) (#23907)
🆑 coiax
add: The NES Port shuttle now costs 500 credits.
/🆑

It's large, but lacking in a lot of the basic supplies that nearly all
other mainline shuttles have. Its current cost is too much.
2017-02-10 10:04:27 -06:00
Jack Edge
ade898a566 Removes shuttle STV5 from purchase (shuttles #3)
🆑 coiax
del: Removes the STV5 shuttle from purchase.
/🆑

STV5 was an admin punishment shuttle, I never envisioned the station
willingly buying it, and it serves as a horrible deathtrap inflicted by
people making poor designs. Our shuttle purchase system doesn't allow
changing, so removing it for now.
2017-02-09 16:14:16 +00:00
KorPhaeron
a2c9af8abf Arena Shuttle 2017-02-06 14:54:58 -06:00
Okand37
2b367d1154 Adds DeltaStation's emergency shuttle to the shuttle file list (#22106)
* Deltastation Playtest map

* Fixed Final Draft Deltastation Testmerge Playtest

* Fixed Final Draft Deltastation Testmerge Playtest and removes empty file

* Final Draft Deltastation bugs, issues, oversights fix 2.0

* More fixes!

* May the fixes guide you on your journey, brave undead

* minor fixes for the night

* more bugfixes 3.0!!

* Adds DeltaStation's emergency shuttle to the shuttle file list

* updating still not finished!

* more updates

* Update shuttles.dm
2016-12-13 17:42:21 +11:00
Thunder12345
625e8f2d3d Minor Scrapheap Challenge fixes + making it ACTUALLY WORK (#22102)
* fuck

* stop
2016-12-10 15:12:56 -05:00
Thunder12345
1a240d82e8 Introducing the Standby Emergency Vessel, "Scrapheap Challenge" (#22009)
* Added fuckshuttle

* Converted to tgm

* In which cheridan ruins the joke

* reeeee
2016-12-10 10:29:40 +13:00
oranges
073ddfd60c Merge pull request #21978 from ChangelingRain/removecoiaxlines
Removes a bunch of unnecessary lines
2016-12-08 10:23:07 +13:00
Joan Lung
081cf25de6 Removes a bunch of unnecessary lines 2016-12-05 23:01:58 -05:00
KorPhaeron
c9dcd95473 Shuttle Requirements 2016-12-03 19:38:38 -05:00
oranges
f0806cd368 Merge pull request #21647 from KorPhaeron/buildyourownshuttle
Allows captains to organize a shuttle build event
2016-11-25 10:13:53 +13:00
Leo
cc0071e720 Adds a config file to enable/disable shuttles from being bought (#21642)
* Adds a config file to enable/disable shuttles from being bought

* Remove useless comment
2016-11-22 11:53:51 +13:00
pubby
7d9c7ec44f PubbyStation bugfixes (#21637)
- fix disposalpipe in brig
- fix missing chapel light
- fix cargo sec filing cabinet
- fix science scrubber pipe
- add station maps
- add atmos waste line
2016-11-22 11:48:56 +13:00
KorPhaeron
b3baa8314c Build your own shuttle 2016-11-19 15:28:25 -06:00
KorPhaeron
615ead8530 Pubby Shuttle Doesn't Work 2016-11-15 12:25:15 -06:00
KorPhaeron
3221c630c5 Adds the luxury shuttle, adds descriptions to other shuttles 2016-11-13 22:31:28 -06:00
KorPhaeron
0435d7ae01 Asteroid Shuttle 2016-11-13 13:15:36 -06:00
KorPhaeron
ac065db80f Captain can buy a new escape shuttle (#21398)
* Captain can buy a new escape shuttle

* A messy way to fix/avoid the issue

* Hopefully fixes potential href exploit

* Makes the code better so oranges wont yell at me anymore
2016-11-11 10:22:46 +13:00