Commit Graph

993 Commits

Author SHA1 Message Date
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 95959a76ef Merge branch 'master' of https://github.com/tgstation/-tg-station into AdminRequests1
Conflicts:
	code/modules/admin/verbs/randomverbs.dm
2016-05-07 12:33:06 +02:00
KorPhaeron 1029e3ce4a Merge pull request #17397 from Shapsy/reload_admins_reloaded
Reloading admins informs un-deadmin'd admins
2016-05-06 20:26:28 -05:00
phil235 524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment
Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm
2016-05-05 21:57:10 +02:00
phil235 76a7fca8fe Some adjustments, following suggestions in the PR discussion. 2016-05-05 21:50:30 +02:00
phil235 68da092009 Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior. 2016-05-05 18:17:51 +02:00
Shaps bd4823e7e3 Now the message for reloading admins comes after the reload 2016-05-04 19:46:02 -04:00
Shadowlight213 50372a586f Adds basic cross server message relay system. Currently setup to relay adminhelps to the other server in the case of no admins on a server. 2016-05-02 11:53:29 -07:00
Jordie 265938e7d9 Merge pull request #17220 from Incoming5643/badmins_doing_shit
View vars will now tell you if something has been previously var edited
2016-05-01 17:02:02 +10:00
phil235 4efb343d77 * Admins can now bypass the vote creation cooldown.
* Messages in a mob's say_log var are now timestamped and include the coordinates of the mob at the time.
* Fix oil slime extract explosion reaction not being logged.
* Fixes lack of log for reagent explosion.
* Mob's attack_log now show when the mob was electrocuted. Doors get an electrification log when electrified (including via an EMP).
* Fixes gibself admin log showing null instead of the key.
2016-04-29 18:21:53 +02:00
phil235 2cc2341536 Fixes runtime when using gibself on an animal.
Fixes gib animation never appearing for carbons.
gib() now has a "no_organs" argument to not spill organs on gib().
gib() also no longer waits for the gib animation to finish before actually qdeling the mob (which was causing the possibility of multi-gibbing animation during cult sacrifice.
Gibself no longer spill organs.
Simple_animal no longer show "X stops moving" when gibbed.
2016-04-29 03:57:16 +02:00
Incoming 10b966b97c View vars will now tell you if something's been previously var edited 2016-04-28 19:38:21 -04:00
phil235 6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-26 21:49:51 +02:00
duncathan salt 61ddd6797d Merge pull request #16969 from YotaXP/tgm-maploader
[DNM] Updates the map loader to support TGM style map files
2016-04-25 09:28:26 -06:00
phil235 fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-24 21:22:37 +02:00
phil235 0caa59b21a First commit of this big PR
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00
Joan Lung 9894342f50 Merge pull request #17017 from Shadowlight213/Admingib
Removes brains dropping from admin caused gibs and c4 suicide
2016-04-23 22:14:36 -04:00
Remie Richards aad72305b4 Merge pull request #16925 from lzimann/patch-6
Fix admin midis not being able to be queued
2016-04-23 12:11:15 +01:00
Leo 893013ecb7 No longer a datum for each player 2016-04-22 15:13:10 -03:00
Shadowlight213 d0670ad141 Removes brains dropping from admin caused gibs and c4 suicide 2016-04-20 20:12:38 -07:00
GunHog f0fe2a0106 Removes SecHUD from AntagHUD
The SecHUD has been seperated from the Antag HUD. Admin ghosts can get
this function through the normal Ghost HUD toggle.
2016-04-20 14:33:08 -05:00
YotaXP 03d38bf895 Adds a 'measureOnly' mode to the maploader code for templates. 2016-04-18 16:04:35 -04:00
Leo a761c900b2 The return of queued midis 2016-04-16 19:32:16 -03:00
duncathan a2a554c48a Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm
2016-04-03 18:22:20 -06:00
duncathan salt f568ae3f31 Merge pull request #16425 from Thunder12345/varspotting
Adds new atom and new datum options to viewvars
2016-03-31 12:07:14 -06:00
duncathan salt 3315717ef9 Merge pull request #16348 from Shadowlight213/adminsoundvolume
Adds client volume control for admin sounds.
2016-03-31 11:59:52 -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
duncathan b9950c4358 turf/open and turf/closed 2016-03-29 13:38:56 -06:00
Thunder12345 82b903f827 Neatens some things up 2016-03-27 22:05:58 +01:00
Thunder12345 0161d6fd8f Adds new atom and new datum options to viewvars 2016-03-27 21:37:33 +01:00
Leo ce5a1da64d Revert "Adds mentorhelp" 2016-03-25 01:48:27 -03:00
Shadowlight213 23b3f77448 Adds volume control for admin sounds. 2016-03-24 21:19:51 -07:00
bawhoppen 109bef0378 easy 2016-03-24 12:56:09 -05:00
bawhoppen 436056cace makes it actually work 2016-03-24 12:41:00 -05:00
bawhoppen e5ba67ed0b makes code significantly less shit 2016-03-24 12:12:51 -05:00
bawhoppen 860d51f090 touches up mentorhelps 2016-03-23 14:24:39 -05:00
Lularian fee5324f33 mentorhelp 2016-03-23 10:44:24 -05:00
AnturK a9b7a27a44 Fixes buildmode dir 2016-03-19 12:36:15 +01:00
AnturK 35bfb9abb6 Merge pull request #16073 from KorPhaeron/humans
Plasmamen fixes
2016-03-16 17:48:29 +01:00
KorPhaeron da8baeaab8 Human fixes 2016-03-15 12:29:35 -05:00
MrStonedOne 71ae9d13aa Adds lag checks to massedit, sdql2, del-all, and the map loader 2016-03-15 03:39:42 -07:00
KorPhaeron 942f0e309e Plasamen fixes 2016-03-12 20:29:10 -06:00
AnturK cc034af9d4 Merge pull request #15999 from ChangelingRain/placesplease
Goon-style blob placement
2016-03-12 21:17:57 +01:00
Cheridan af0575cf8b Merge pull request #16016 from KorPhaeron/communications
Responding to a centcomm message resets the machines cooldown
2016-03-11 11:58:17 -06:00
duncathan 12a6205372 Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
Conflicts:
	_maps/RandomRuins/SpaceRuins/asteroid4.dmm
	_maps/RandomRuins/SpaceRuins/spacebar.dmm
	_maps/RandomZLevels/Academy.dmm
	_maps/RandomZLevels/beach.dmm
	_maps/RandomZLevels/caves.dmm
	_maps/RandomZLevels/research.dmm
	_maps/RandomZLevels/snowdin.dmm
	_maps/RandomZLevels/spacebattle.dmm
	_maps/RandomZLevels/undergroundoutpost45.dmm
	_maps/RandomZLevels/wildwest.dmm
	_maps/map_files/AsteroidStation/AsteroidStation.dmm
	_maps/map_files/BirdStation/BirdStation.dmm
	_maps/map_files/DreamStation/dreamstation04.dmm
	_maps/map_files/DreamStation/z5.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/map_files/generic/z5.dmm
	_maps/map_files/generic/z6.dmm
	_maps/templates/lavaland_surface_prisoner_crash.dmm
	_maps/templates/lavaland_surface_seed_vault.dmm
	_maps/templates/lavaland_surface_ufo_crash.dmm
	code/game/asteroid.dm
	code/game/atoms.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/machinery/computer/arcade.dm
	code/game/objects/structures/lattice.dm
	code/game/turfs/simulated/floor/fancy_floor.dm
	code/game/turfs/simulated/floor/misc_floor.dm
	code/game/turfs/simulated/floor/plasteel_floor.dm
	code/game/turfs/simulated/walls_misc.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/mulebot.dm
	code/modules/mob/mob_movement.dm
2016-03-10 23:07:21 -06:00
duncathan 5bf31463da removes simulated turfs; adds space gas mixture for space 2016-03-10 17:27:01 -06:00
KorPhaeron 1f177d3ab2 Communications 2016-03-09 22:42:03 -06:00
Nerd Lord 1ead1acbfc Goon-style blob placement 2016-03-09 20:21:19 -05:00
Mike Long daf13e0f19 Now works with gangs too (provided the gang was created BEFORE antaghud was turned on) 2016-03-05 15:00:29 -05:00