Commit Graph

2030 Commits

Author SHA1 Message Date
Xhuis
382c58cf23 Maybe now? 2016-05-24 18:25:20 -04:00
Cheridan
6d6711facb Merge pull request #17822 from optimumtact/keepphilfromkillinme
MakeSlippery proc made more readable with named arguments
2016-05-24 11:59:24 -05:00
AnturK
802cdf9f5c Merge pull request #17839 from optimumtact/watisgoinon
Fix an antipattern when using canUseTopic
2016-05-24 17:46:11 +02:00
Xhuis
9db933124d Conflicts III 2016-05-22 15:05:00 -04:00
Joan Lung
64e850f38b Merge pull request #17775 from coiax/fix-17480
Fixes #17480; tabling not breaking glass tables
2016-05-21 21:00:47 -04:00
oranges
f2bf80843f MakeSlippery made more understandable by named args tweak
Also used a max check to reduce lines of code slightly
2016-05-22 00:42:11 +00:00
oranges
947e2c5c19 Fix an antipattern when using canUseTopic
remove redundant range checks that are checked in the fixed canUseTopic
2016-05-22 00:23:47 +00:00
oranges
8d6da5d01f Merge pull request #17796 from bgobandit/sofuckingmetal
Runed metal no longer deletes girders when used on them.
2016-05-21 22:56:45 +12:00
Jack Edge
8ff4486ab7 Fixes #17480; tabling not breaking glass tables
Fixes #17480.

Also catches a rare case where people would be thrown onto the tables
from afar by checking whether there are any mobs on the table with
a spawn call.

- Glass tables are now coloured by Nar'sie.
- Glass tables pregenerate and store their shatter debris.

🆑 coiax
fix: Glass tables now break when people are pushed onto them.
/🆑
2016-05-21 10:48:04 +01:00
oranges
6486b588c6 Merge pull request #17333 from nullbear/less-wetness-updates.-Ice-sliding-in-no-slips-
Wetness stuff.
2016-05-21 14:46:09 +12:00
Cheridan
328a69ebf2 Merge pull request #17396 from KorPhaeron/security
Gives the HoS a pinpointer
2016-05-20 06:35:30 -05:00
bgobandit
b2ea93323d Runed metal no longer deletes girders when used on them. 2016-05-19 16:46:57 -04:00
KorPhaeron
8aabf3d5f5 Removes some old sprites 2016-05-18 00:50:07 -05:00
Xhuis
3db3acc10c Conflicts II 2016-05-17 07:13:01 -04:00
RandomMarine
8b3a4a1570 Makes map placed broken grilles act normally. (#17678)
* Adds proper mapstart broken grilles

* Adds proper mapstart broken grilles
2016-05-16 22:10:01 -05:00
Xhuis
23073619a2 Conflicts III 2016-05-15 00:59:44 -04:00
Xhuis
45ef8a5e00 Ratvar, the Clockwork Justiciar 2016-05-15 00:59:28 -04:00
Cheridan
d5c70bc5f2 Merge pull request #17613 from coiax/morphling-holodeck
Removes materials from holodeck chairs and windows (Fixes #17612)
2016-05-13 23:35:00 -05:00
Jack Edge
611e19e49a Window debris on creation, release on destruction 2016-05-13 21:50:03 +01:00
Annie Acosta
ec90f1d23f gives security their normal headsets back (#17467) 2016-05-13 12:47:15 -05:00
AnturK
2372330eef Merge pull request #17611 from Crushtoe/grammar-fix
Fixes a grammar issue with lockers
2016-05-13 19:33:49 +02:00
AnturK
7ab038d627 Merge pull request #17579 from phil235/FixHeaterSign
Fix bundle: space heater & signs
2016-05-13 19:29:33 +02:00
Jack Edge
d9bfa9e820 Removes materials from holodeck chairs and windows
- Breaking a chair with NODECONSTRUCT no longer produces materials.
- Breaking a window with NODECONSTRUCT now reliably does not produce
materials.
- Also moved the creation of debris into the window's shatter() proc,
because doing it on creation is dumb, and unreliable.
2016-05-12 16:30:38 +01:00
Crushtoe
69508ecc90 Fixes grammar issue 2016-05-12 08:19:04 -05:00
phil235
398cb06974 Fixes space heater temperature setting function.
Fixes sign structures becoming blank with detached. The detached sign now keep the sign's sprite.
2016-05-11 23:33:15 +02:00
Joan Lung
a4f1318d88 Merge pull request #17496 from coiax/pie-pie-pie
Cream pie map edits
2016-05-10 11:06:41 -04:00
Jack Edge
631d854187 Only one pie in a closet 2016-05-10 11:46:50 +01:00
Cheridan
ee4d3785a3 Merge pull request #17484 from ChangelingRain/fixrobustinscode
Cleans up some cult code
2016-05-09 15:35:14 -05:00
Jack Edge
40c90f6800 Added cream pie closet, for clowns, by clowns 2016-05-08 22:10:56 +01:00
Mercenaryblue
cf39b78cc2 The Creampie Throw Update (#17392)
* Items washing banana cream

Allow common methods of cleaning to wash banana cream pie off your face.

* Janiborg cream washing

Janiborgs can now wash cream by running over people.

* Added Creampie Overlay code

When a banana cream pie hits a target mob, it applies a new overlay to
the mob. This overlay can then be cleaned via soap, shower, cleaner
spray, etc.

* Cream Pie Throw Update

When hit by a banana cream pie:
Adds a creamy overlay to various mobs.
Knock targets off for less than a second.
Enable cleaning the overlay via soap, shower, and others means.

* else fix

replace unnecessary if w/ else

* Revert "else fix"

This reverts commit 5dc5707981f8bc312b8e3ac4ce9ab16e7f20c855.

* else fix

* Catch Fix

Catching a thrown cream pie will no longer delete the item in your hands

* Xeno State Creamy Fix

Tossing a cream pie will now apply the appropriate overlay to a dead or
sleeping xenomorph.

Unfortunately, the xenomorph is still able to shake the cream off by
switching state, and it keep pushing the wrong overlay on critical
xenomorphs.

* Human-only code

Simplify code to affect only humanoids.

* Revert "Human-only code"

This reverts commit f74cb0e3af08fc0b793987ed9711dbbfd4d8561b.

* Human Code Only

Pls no Travis

* Optimize code

As requested

* Bug Fix

Overlay no longer unwashable when species get changed via
badmin/magic/etc.
2016-05-08 21:39:23 +02:00
Nerd Lord
4e2cefaddf Merge branch 'master' of https://github.com/tgstation/-tg-station into fixrobustinscode
Conflicts:
	icons/mob/mob.dmi
2016-05-08 14:33:54 -04:00
Nerd Lord
ff984ec0cc cleanup 2016-05-08 11:46:26 -04:00
Core0verload
a66c2f4418 Machine/computer boards and frames refactor (#17300)
* Map Changes

* Machine/console boards and frames refactor

* More board changes
2016-05-08 12:11:18 +02: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
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
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
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
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
KorPhaeron
89c3283e0f Security Lockers 2016-05-04 18:34:31 -05: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
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
nullbear
a7fc4b8523 rebalances durations.
Rebalances durations because i increased the handlewet timer.
2016-05-02 06:43:39 -07:00
nullbear
f97c8c2af4 wetness stuff 2016-05-02 06:19:28 -07: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
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