Commit Graph

7658 Commits

Author SHA1 Message Date
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
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
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
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
Jack Edge
28945b6ea5 Added maintenance fridge, mint, moved sink 2016-05-06 13:59:43 +01: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
0cb2103a84 Merge pull request #17358 from nullbear/crontroversial-fingerpointing-and-blame-pr
makes pointing better.
2016-05-04 17:00:12 -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
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
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
Cheridan
e7ee10b517 Merge pull request #17060 from KorPhaeron/belt
Military Belt is not a backpack
2016-05-03 13:10:23 -05: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
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
Jack Edge
7c293f0aa6 Spray cans contain flammable solvents
Also, spraying someone will stun them even if they lack a client.
2016-05-02 22:19:49 +01:00
Jack Edge
8a3776cc61 Glass tables shatter more often
- Glass tables do not break if they have the NODECONSTRUCT flag
- Glass tables break if any living mob crosses them above small size and
  under the effects of gravity.
2016-05-02 12:47:35 +01:00
KorPhaeron
31cc0d1dc8 Merge pull request #17264 from PKPenguin321/patch-2
makes screwing windows 1 second faster
2016-05-02 03:51:52 -05:00
MrPerson
e07bd56b55 [s] Monkey cubes work in sinks again 2016-05-02 01:45:46 -07:00
Cheridan
23cb217905 Merge pull request #17299 from RandomMarine/mobile
Changes locker description
2016-05-01 22:26:15 -05:00
Joan Lung
3eeb0cb8e9 Robust Cult changes
* Robust Cult changes

* just cache the turf ffs

* if you see something say nothing and drink to forget

* if you see something, say nothing and drink to forget

* messagefix

* if you see something say nothing, and drink to forget

* if you see something say nothing and drink to forget

* if you see something say nothing and drink to forget

* if you see something say nothing, and drink to forget
2016-05-01 21:37:02 -05:00
TechnoAlchemist
74bb2b28ab makes sure people have the right types of armor 2016-05-01 18:59:51 -07:00
TechnoAlchemist
b3286b9d39 Fixes alt sprites not working. Changes sprites of HOP armor and BARKEEP armor. 2016-05-01 18:52:12 -07:00
Joan Lung
d31f5ed876 Merge pull request #17280 from TechnoAlchemisto/I_can't_escape_my_cycles_of_guilt
Security Fashion Refactor
2016-05-01 19:33:22 -04:00
bawhoppen
0a83426f54 removes trailing returns 2016-05-01 17:33:18 -05:00
bawhoppen
7aa5e85dba fixed memes 2016-05-01 16:48:29 -05:00
MMMiracles
a72e48ffe3 the fact this never came up is surprising 2016-05-01 12:20:06 -04:00
Jack Edge
d9aac22800 Code review 2016-05-01 16:10:00 +01:00
Joan Lung
72f25a53e6 Merge pull request #17277 from KorPhaeron/cyborg_buffs2
Cyborg Blueprints
2016-05-01 11:05:48 -04:00
Jordie
9c53ce5f85 Merge pull request #17240 from Core0verload/firecabinet_decon
Wall-mounted extinguisher cabinets are now constructable/deconstructable
2016-05-01 18:09:25 +10:00
nullbear
3d781f1498 Implements freezie floors and buffs frostoil (#17081)
* Implements freezie floors and buffs frostoil

🆑 nullbear
rscadd: A reminder for crew to avoid mopping floors in cold rooms, as
the water will freeze and provide a dangerous slipping hazard known as
'ice'. Running on it is not recommended.
rscadd: frostoil is deemed an effective chemical for cooling down areas
in the event of a plasma fire.
:/cl:

Makes wet floors freeze in cold environments, and evaporate in warm
environments.

Makes frostoil cool the atmosphere, and make the floor wet. Typically
resulting in icy floors.

Fixes gluon grenade potentially making floors permanently icy.

* tweaks to gluon bomb as per bawhoppens request

* Update syndieminibomb.dm

* Update open.dm

* Update open.dm

* Update syndieminibomb.dm
2016-05-01 17:26:46 +10:00
Jordie
f3f0c63e4f Merge pull request #17245 from nullbear/c4-path
Changes C4 Path and adds X4 breaching charge
2016-05-01 16:41:07 +10:00
Lularian
31ced651d0 commits, what are they good for 2016-05-01 00:51:17 -05:00
RandomMarine
ed975d5785 Nerfs closet description 2016-04-30 20:44:32 -07:00
Jack Edge
80a0e230e2 Suicide and RSF fix 2016-04-30 19:27:13 +01:00
Jack Edge
51d3dc9242 Hand labeler 2016-04-30 18:44:01 +01:00
Jack Edge
3d458b857c Service cyborgs get a spraycan
🆑 coiax
rscadd: The Service cyborg module now has a spraycan built in, for
hijinks and passing on important urban messages.
/🆑
2016-04-30 15:26:22 +01:00
Cheridan
35a975f82b Merge pull request #17221 from phil235/FixGib
Fixes bugs with gib()
2016-04-30 06:58:29 -05:00
bgobandit
e5ed72520e Ports Cards Against Spess from Polaris (MERGEPLS) (#15872)
* Ports Cards Against Spess from Polaris

* moar

* more

* Moves cards to config files, adds a fuckton more

* ADDS THE FUCKING CARDS TO THE FUCKING MAP TAKE 3 HATE SALT

* fixes the maps, shuts travis THE FUCK UP

* fixes typo

* makes requested changes
2016-04-30 13:35:51 +02:00
KorPhaeron
d8db2a1643 Merge pull request #17224 from ChangelingRain/IDlock
Hitting a locker or crate with an ID, PDA with ID, or wallet with ID will try to toggle the lock instead of opening it
2016-04-30 05:32:42 -05:00
phil235
04018648d1 Merge branch 'master' of https://github.com/tgstation/-tg-station into FixGib
Conflicts:
	code/modules/mob/living/death.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
2016-04-30 12:30:36 +02:00
TechnoAlchemist
03bce7b03d three two one let's jam 2016-04-30 03:01:38 -07:00