Commit Graph

40 Commits

Author SHA1 Message Date
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
pubby
c5609f7dae PubbyStation update #2 (#21345)
* PubbyStation Update

- add space monastery + chaplain job
- add a white ship
- add pre-built turbine to toxins
- add side door to bar
- add more floor decoration (thanks Tacolizard!)
- add pick+bag to aux closet
- rearrange viro to be more efficient
- increase mineral yield of bomb-testing asteroid
- fix faulty wiring in brig
- other stuff I forgot

* Add even more detailing

* Whoops forgot to fix some names

* god damnit

* aaaaaaaaaaaaaaaaaa

* Move pubbystation-specific code into map folder.

I don't think this is such a good idea.

* More PubbyStation detailing

* Add two missing fire alarms

* Add library scanner to library

whoops
2016-11-08 09:26:45 +13:00
NikNakFlak
aed85fca8b Fixes two more bugs (I should really test my maps) 2016-06-30 00:17:31 -07:00
Jack Edge
241966945a All access "greentext" on clown brig 2016-06-25 18:13:08 +01:00
coiax
4d091c010e Adds Asteroid emergency shuttle to station (#18125)
Wow, this one is a WEIRD one.
2016-06-02 15:48:08 -05:00
oranges
1ebc858091 Merge pull request #17962 from coiax/admin-logging
Adds admin logging to megafauna movement, shuttle loading
2016-05-30 11:00:14 +12:00
Jack Edge
3910a546e6 Adds admin logging to megafauna movement
🆑 coiax
rscadd: Admins are now notified if a megafauna uses a wormhole or a
shuttle.
rscadd: A new Shuttle Manipulator verb has been added for quick access
to probably the best and most bugfree feature on /tg/.
/🆑

Megafauna adminnotifies on portal TP

Standard shuttle names and logging

Also ignore .mdme files

Muh commit

Actually works and stuff
2016-05-28 16:26:28 +01:00
Jack Edge
37d84f7fc4 Adds Ministation shuttle to shuttle templates 2016-05-28 14:55:39 +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