Commit Graph

14792 Commits

Author SHA1 Message Date
Core0verload
ea655923bc Can screwdriver swarmer shells to disable them (#17202)
* Adds 1 new ways to destroy inactive swarmer shells

* Swarmers are now exportable

* Feedback messages
2016-05-07 23:21:09 -05:00
Robustin
7e5d0d69e3 The Cult Rises... Part II (#17228)
* Update cult_items.dm

* Update cult_structures.dm

* Update access.dm

* Update sheet_types.dm

* Update girders.dm

* Update walls_misc.dm

* Update cult_structures.dm

* New Items

* Structure improvements

* Unholy Update 2

* Spooky door

* Runed Metal creation

* Item fixes

* ABSOLUTE MADMAN

* ABSOLUTE MADMAN

* Final Tweaks

* Final Tweaks

* Final Tweaks

* Health adjustment

* Update cult_structures.dm

* clamp gone

* Dotting the i's and crossing the t's

* Grammar

* Capitalization, etc.

* time2mergebeg

* Added files via upload

* Added files via upload

* Self-reviewed PR, we're good to go now fam

* Self-reviewed PR, we're good to go now fam

* Self-reviewed PR, we're good to go now fam

* Self-reviewed PR, we're good to go now fam

* Self-reviewed PR, we're good to go now fam

* MERGE CONFLICT MAYMAYS

* Structures tweak

* Curse Improvements

* Icon update

* Phil Changes

* Phil Changes

* Phil Changes

* Phil Changes

* Phil Changes

* Phil change

* New York Phil-harmonic

* I-I like the original better anyway

* Spacesuits aren't THAT magical

* Can't have cultists getting TOO tricky eh
2016-05-07 23:07:10 -05:00
Joan Lung
dd7384d411 Constructs can now invoke runes (#17345)
* Constructs can now invoke runes

* constructs can't blood boil they have no blood
2016-05-07 22:28:43 -05:00
Incoming5643
43df1e3570 [s] Adds a one in a million chance to win a pulse rifle from arcade machines (#17430)
* Adds a one in a million chance to win a pulse rifle from the arcade machines

* As I said, 4:30 AM

* Reduces the memes of a meme pr
2016-05-07 19:06:15 -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
AnturK
d11809196a Merge pull request #17385 from coiax/table-loot
Maint table tweaks
2016-05-07 13:35:21 +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
Cheridan
2dc2c3e047 Merge pull request #17331 from TechnoAlchemisto/gangfix
Gang tools no longer beep.
2016-05-06 21:53:22 -05:00
Cheridan
ea0730bffb Merge pull request #17400 from bgobandit/whywouldyounotdothis
Conversion to the gang now places your gang info in your notes.
2016-05-06 21:42:03 -05:00
Joan Lung
5188387792 Merge pull request #17420 from coiax/robustin-pantry
New SW Maint Pantry (Box) (like #17283 but more mergable)
2016-05-06 20:06:04 -04:00
Jack Edge
0cb07d4c3f Empty loot spawn back to 4 2016-05-07 00:51:34 +01:00
Joan Lung
85bc1ecb26 Merge pull request #17416 from coiax/pai-boot-noise
pAI card plays a noise when personality is loaded
2016-05-06 19:47:11 -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
Jack Edge
28945b6ea5 Added maintenance fridge, mint, moved sink 2016-05-06 13:59:43 +01:00
Joan Lung
7dc3c980f0 fixes roundstart comms (#17423) 2016-05-05 23:23:57 +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
34afa1a98e pAI card plays boot_noise when personality loaded
- Added pai_boot.ogg sound file

https://www.freesound.org/people/jalastram/sounds/317638/

- Uses pai_boot.ogg noise when personality loads
2016-05-05 15:56:05 +01:00
Cheridan
a8dff2fbc8 Merge pull request #17372 from ChangelingRain/helprev
Nerfs revenant
2016-05-05 02:36:23 -05:00
Cheridan
db2aa9d33b Merge pull request #17371 from Robustin/ThisEndsNow
Adds fun back to the game
2016-05-05 02:33:53 -05:00
bgobandit
3f00658557 Conversion to the gang now places your gang info in your memory/notes. 2016-05-04 21:26:06 -04:00
Nerd Lord
2a09852a60 proper 2016-05-04 18:45:10 -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
d58065d6ae Merge pull request #17360 from ChangelingRain/tipoftheblob
Examining the blob with an active research scanner or medical hud will display its effects
2016-05-04 14:40:08 -05:00
Jack Edge
ea821dcaef Maint table tweaks
Merged coloured gloves into one, added airlock painter, added secure
briefcases in preperation for the great mystery box ride.
2016-05-04 19:05:39 +01:00
Joan Lung
09b6caeb0e Merge pull request #17336 from coiax/coiax-fixes-things
Glass tables break more, Metastation HoP hat fix
2016-05-04 07:36:37 -04: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
Joan Lung
27824d0489 Merge pull request #17301 from Bawhoppen/syndieboxes
Makes nukeop start with syndie gasmask in internal box
2016-05-03 22:56:06 -04:00
Nerd Lord
88a41ff7af nodensity 2016-05-03 22:45:52 -04:00
Nerd Lord
dda8aaad65 Nerfs griffghost 2016-05-03 22:17:39 -04:00
Robustin
d68773bc70 Spoopy ghost leaf this plase 2016-05-03 22:05:51 -04: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
Cheridan
afd5f80669 Merge pull request #17352 from Shadowlight213/Monkeylose
Fixes monkey mode victory condition
2016-05-03 20:18:29 -05:00
bawhoppen
216f321030 ree copypaste 2016-05-03 20:09:27 -05:00
kilkun
b13bd68640 Makes dehydrated carps more fun (#17302)
* Beginning of new side-tag

First bit of code to implement the Syndicate Lawyer, a single-man antag
with a plethora of abilities and armor to help him including:
>Turning unimplanted crew into gang members
>Disguising himself as a crew member to implanted folks
>Ripping open doors and blast shields

This commit includes:
>Rudimentary event code
>WIP ganger code
>Clothing defines

And modifies the default gang_datum, which will be relevant when ganger
code is finished.

* Makes Dehydrated Carp more malleable for fun

Allows admins to change what mob spawns from dehydrated carp via var
editing.

* removes bloat

Wew this commit history will look wack

* wew

* wew number 2

* Revert "wew"

This reverts commit 75dce9ec56bc8c69c1e7a338d98d4f9e64f3cf9d.

* Revert "removes bloat"

This reverts commit 55a456593709d67a030f15c5b10e5d9aa6042f87.

* Revert "Revert "removes bloat""

This reverts commit 1994fdd08ecb51cd1fd9e09973954c9800ed0f54.

* makes codebase great again

* Final destination for codebase fixes

WEW LADS

* Fixes compiler errors

* Actually properly fixes compile errors

* Fixes missed incorrect variable

This is starting to get ridiculous for a simple feature

* This is starting to get embarrassing.
2016-05-03 19:30:32 -05:00
KorPhaeron
ac6e26abc0 Merge pull request #17343 from ChangelingRain/lowpop
Reduces cult minimum population to 24
2016-05-03 19:24:34 -05:00
Joan Lung
24d2de54a6 Merge pull request #17332 from MrPerson/giving_a_monkey_a_shower
Monkey cubes work in sinks again
2016-05-03 20:19:33 -04:00
Nerd Lord
d824fb59cd many worryingly accurate numbers 2016-05-03 19:50:26 -04: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
Cheridan
e7ee10b517 Merge pull request #17060 from KorPhaeron/belt
Military Belt is not a backpack
2016-05-03 13:10:23 -05:00
Nerd Lord
52ea8517c4 drones and swarmers get diag hud 2016-05-03 13:00:17 -04:00
Nerd Lord
3ab974494e Gives all living mobs a medical hud display 2016-05-03 12:13:43 -04:00
Nerd Lord
9acf8c7087 medhud too 2016-05-03 11:08:13 -04:00
Nerd Lord
6a7142962f Examining the blob with an active research scanner will display its effects 2016-05-03 10:56:26 -04:00