Commit Graph

6941 Commits

Author SHA1 Message Date
KorPhaeron
e4559ff03e Removes redundant line 2016-05-09 15:54:50 -05:00
KorPhaeron
98f927ac21 Player controlled swooping 2016-05-09 01:35:02 -05:00
KorPhaeron
1cb4408def Removes extra lines, bad loot 2016-05-08 12:54:55 -05:00
KorPhaeron
cb13c1dcce Makes drakes more hugbox 2016-05-08 07:24:35 -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
AnturK
0a4d0e7a23 Merge pull request #17393 from ChangelingRain/lesshud
Fixes a few simple animal huds
2016-05-07 21:44:22 +02:00
KorPhaeron
34b08537a4 Merge pull request #17411 from KingDairy/master
Fixes the Lavaland Gym
2016-05-07 13:13:48 -05:00
Joan Lung
645b777887 Merge pull request #17418 from coiax/holocarp-colours
Adds additional holocarp colours
2016-05-06 19:46:07 -04:00
Cheridan
789e5369df Merge pull request #17419 from phil235/Dismemberment
Dismemberment
2016-05-06 18:42:48 -05:00
phil235
53c5b7f5d5 Fixes lizard body markings appearing behind the bodypart layer.
Fixes tail sprite when missing a leg and facing south.
Adds an admin option in human VV to remove a body part.
Fixes typos.
Fixes being able to toggle hardsuit and wintercoat helmet despite having no head.
Changes the dismemberment chance from explosion: bomb armor helps against it, and the maximum number of limbs that you can lose in one explosion is capped depending on the explosion severity.
Missing 1 or 2 legs makes you significantly slower. If without legs, missing an arm makes you slower. You can no longer move when missing all four limbs.
Bodyparts have now force 3 and throwforce 3
Tongues are now properly put in decapitated heads.
Shaking a legless person no longer gives weird results.
2016-05-07 01:00:00 +02:00
phil235
c1e1fa03b2 fixes the healthdoll. 2016-05-06 01:05:09 +02:00
Robustin
b9e3e6ad34 Zombies airlock attack: Sound improvement (#17181)
* Zombie airlock attack noise

* Delay between noises

* Noise delay tweak

* Kor fix

* PROXIMITY CHECK SO WE CAN HAVE DELAYED NOISE FOR IMMERSION

* Spawn change
2016-05-06 00:58:54 +02:00
phil235
f8260e1d3d always gotta fail the merged conflict fixing. 2016-05-05 22:16:19 +02: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
Jack Edge
ab6d021fab Adds additional holocarp colours
- Adds the Sand, Seashell, Coral, Salmon, Sunset and Riptide colours
  to the holocarp colour pool.
2016-05-05 17:12:08 +01:00
KingDairy
3552497535 Adds the boss of this gym... 2016-05-05 02:30:11 -06:00
KingDairy
edab804b15 you can't just put space at the start of things 2016-05-05 00:22:32 -06:00
KingDairy
bf1e19dc83 Update zombie.dm
yeah this looks about right
2016-05-05 00:02:26 -06:00
Nerd Lord
1e03d4f1a5 ignore color changes 2016-05-04 20:29:58 -04:00
Nerd Lord
35b601016c Fixes a few simple animal huds 2016-05-04 18:40:58 -04:00
Cheridan
0cb2103a84 Merge pull request #17358 from nullbear/crontroversial-fingerpointing-and-blame-pr
makes pointing better.
2016-05-04 17:00:12 -05:00
Cheridan
86129d6841 Merge pull request #17334 from AnturK/fixpack1
Fixes spider examine and lavaland generator.
2016-05-04 16:51:02 -05:00
Cheridan
43c98210dd Merge pull request #17363 from ChangelingRain/notverysimple
Gives all living mobs a medical hud display
2016-05-04 14:52:13 -05:00
Cheridan
3430bc9753 Merge pull request #17328 from TechnoAlchemisto/ARRPEE
Adds new emotes, allows for CAPITAL LETTERS to work in emotes.
2016-05-04 01:28:11 -05:00
TechnoAlchemist
528ce49e57 Adds dragon hide cloaks (#17322)
* dragon scales and cloak stuff

* Finishes shit with the ash drakes and the cloak

* woopsie
2016-05-04 00:43:31 -05:00
Cheridan
7909f8728d Merge pull request #17351 from KorPhaeron/dragon3
Drake Fixes
2016-05-03 22:52:34 -05:00
TechnoAlchemist
03731c294b Cheridan is my childhood role model 2016-05-03 20:52:19 -07:00
Cheridan
75f404b326 Merge pull request #17337 from ChangelingRain/innatecomms
Cult communication is now innate and has an action button
2016-05-03 20:23:52 -05:00
Joan Lung
85d60e93f3 Merge pull request #17318 from coiax/we-can-hear-you
Revenant and alien whispering heard by ghosts
2016-05-03 17:16:28 -04:00
Nerd Lord
eea7ffb8c0 lockstep guardian hud 2016-05-03 16:27:40 -04:00
Nerd Lord
52ea8517c4 drones and swarmers get diag hud 2016-05-03 13:00:17 -04:00
KorPhaeron
6e10a6a839 Stronger Attack 2016-05-03 11:46:09 -05:00
Nerd Lord
3ab974494e Gives all living mobs a medical hud display 2016-05-03 12:13:43 -04:00
nullbear
ec7300f70e makes it impossible to join the server unless your ckey is prefixed with "im_a_cuck_" 2016-05-03 02:38:38 -07:00
KorPhaeron
d191efc751 Merge pull request #17329 from Cheridan/scavengers
Ashwalker Den Update
2016-05-03 03:01:50 -05:00
Jack Edge
72310cc63e More code review 2016-05-03 08:16:26 +01:00
Cheridan
e64783c1fa Merge pull request #17282 from coiax/brobot-is-an-artist
Service and standard cyborgs get a spraycan; service cyborgs get a cyborg-hand labeler
2016-05-03 01:55:01 -05:00
KorPhaeron
423ee67c73 Merge pull request #17330 from coiax/lavaproof-staff
Staff of lava is now lavaproof
2016-05-03 01:03:46 -05:00
KorPhaeron
11fa336dd9 Ghost sword fix 2016-05-03 00:10:39 -05:00
KorPhaeron
9775b8cdcc Dragon Fixes 2016-05-02 21:44:11 -05:00
Jack Edge
50fd90e25f Fixes compile errors 2016-05-02 23:20:12 +01:00
Jack Edge
c1e4c0163c Code review 2016-05-02 23:08:31 +01:00
TechnoAlchemist
a43735baab s 2016-05-02 12:44:05 -07:00
AnturK
340b1d01ff Merge pull request #17314 from RemieRichards/mecha_pilot_fix
Mecha and Mecha pilot fixes
2016-05-02 20:25:44 +02:00
Remie Richards
bc754a7bfc Fixes Haunted Mecha, Fixes Mecha damage runtimes, Fixes Mecha bumpsmash working without a pilot. 2016-05-02 17:18:34 +01:00
Nerd Lord
0897f3bc20 Cult communication is now innate and has an action button 2016-05-02 09:11:06 -04:00
AnturK
3e07316cec Fixes #17321 2016-05-02 12:07:18 +02:00
AnturK
878d76a4b7 Merge pull request #17062 from Core0verload/bloodbrood
New function for hivelord core / legion heart
2016-05-02 11:39:18 +02:00