Commit Graph

3406 Commits

Author SHA1 Message Date
ArcaneMusic
e8160371a7 Adds the Cleric's Den ruin, and Datum Maces. (#46915)
* REWROTE EVERYTHING

* And these too

* Mapmerger as usual

* Qust changed some datum mat stuff, fixed

* Updated the rune sprite to be in-line with blood cult style runes.

* Uses a less degenerate sprite for the rune
2019-10-20 00:24:58 -04:00
spookydonut
4e8ff18b07 Fix Travis grep script to use PCRE to actually match things (#47065)
Several of the greps were missing the `-P` switch which caused them to 
fail to match things. The EOL grep also wasn't working right so I 
replaced it with the one I added to TGMC.
2019-10-19 10:21:05 -07:00
Fikou
d61384ce84 adds bronze windows and airlocks (#46921)
* bronze windows

* awoo

* badoom

* bronze airlock

* awoo

* nice

* oof
2019-10-18 20:11:27 -04:00
81Denton
6e4996e6e3 Merge pull request #47157 from Time-Green/plunger-masks
Adds plunger unicorns
2019-10-19 01:24:02 +02:00
Emmett Gaines
8982f509b5 Refactors screen object update_icon to call parent (#47094)
* Refactors screen object update_icon to call parent

And makes update_icon an /atom proc

* Cleans up some missed null checks

The student teaches the master
2019-10-17 18:21:50 -07:00
Time-Green
57993f9a7c thanks vscode, very cool! 2019-10-17 13:55:18 +02:00
Time-Green
53457de5aa adds plunger unicorns 2019-10-17 13:44:50 +02:00
TheChosenEvilOne
8605ae2142 Multi-Z improvements part 2 (#47097)
* MultiZ Improvements

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* RCD works on openspace now.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* I knew something like this would happen with rebasing.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Copy-Paste is gone!

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-10-17 11:02:40 +02:00
carlarctg
cc999b2815 Twat carpets have reagents/ Oil is now considered Fuel (#46930)
* bra

* ME GRAMMAR GOOD?

* asbestos in your lung

* Merge branch 'master' into CARPET

* Merge branch 'master' into CARPET

* bruh

* Revert "bruh"

This reverts commit 186de868197ee5904ae2e72060736dc3a505f66d.

* Revert "Revert "bruh""

This reverts commit a855f2b838f02b852fb16f4a15123ca5a26b858f.

* orange man, reasonable

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-Authored-By: Fel <fludd121@gmail.com>

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* cobby is a good amnitni

* e
2019-10-16 17:30:18 -04:00
81Denton
e2955a3315 Makes CentCom Tomb of the Unknown Employee statue indestructible (#47066) 2019-10-15 10:50:52 -04:00
KomradeSpectre
9ff071af60 Clockcult Removal 2019 (#47057)
* Nanotrasen fires the Wave Motion Gun at the Clock Cult

* Fixes a random changelog appearing from the reebe void.

* Fixes a wrong type reference regarding the bronze sheets in the Lavaland Ruin for it.

* Fixes redundant cells after CC removal in ruin by populating them with varied ore chunks, or destruction clutter.

* why is it /obj/item/stack/sheet/metal but not /obj/item/stack/sheet/iron

* Fixes the lavaland ratvar ruin to have fluff variant structures of deleted shit it referenced instead what I thought was reasonable.
2019-10-15 10:13:41 +02:00
Qustinnus
908ccfe7b3 Fixes some material datum bugs (#47049)
* fixes

* chair

* ass

* fixes

* dumb

* done

* fix
2019-10-14 00:36:56 -04:00
TheChosenEvilOne
f193939b57 Multi-Z fixes (#47046)
* Fixed multi-z throwing and changed isliving in stairs.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Openspace can no longer be deepfried.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-10-13 19:45:10 +02:00
Rob Bailey
e1683f674f Merge pull request #46978 from willox/duplicate-variable-stuff
removed a bunch of duplicate member variable definitions and entirely duplicated types
2019-10-12 03:44:15 -07:00
nemvar
c38a7a3bb5 Removes a bunch of var/ in procs (#46946)
* Removes a bunch of /var in procs

* reset this

* Why wasn't this already?
2019-10-10 04:20:27 -07:00
William Wallace
c688bc39f7 remove duplicate var from /obj/structure/closet/cardboard 2019-10-08 23:25:38 +01:00
William Wallace
ea39325ec5 remove duplicate var in /obj/structure/flora/rock/jungle 2019-10-08 23:24:28 +01:00
Qustinnus
a394ccdc2b Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) (#46525)
removes materials list from items, uses custom_materials instead. This might introduce some bugs so we should testmerge this for a while (and Ill test stuff locally as much as I can)

this also adds material crafting to sheets. Test case being chairs. In the future we can add stuff like tables, walls, doors etc.

also applies materials to everything, with fixes, which can close #46299
2019-10-08 11:06:02 -04:00
carlarctg
d6210b95ce Adds fireproof masks, and tweaks flameproof atmos clothing (#46732)
* the masks

* the startups

* more touchies

* whoops

* actually this is useless

* that's better

* i made a whoopsie boopsie

* bullying is not okay

* should stop coding at 2 am, but i am being a hypcrite now
2019-10-07 10:55:22 -04:00
Rob Bailey
b4c34c8b58 Tabling Rework (#46383)
* nutable

* more damage

* halved time

* louder + slightly different sound

* head slam + nerfed table damage

* martial art breaks table + headsmash damages table

* stamina boost to headsmash

* functional table crushing
2019-10-06 19:26:12 -04:00
nemvar
a148cae769 Kills obj/item/projectile in favour of obj/projectile (#46692)
* Kills obj/item/projectile in favour of obj/projectile

* Resolves conflicts properly

* fixes that one map

* it lives
2019-10-06 13:37:24 -04:00
Twaticus
70b68366e4 More Carpets & Tables (#46850)
Ports carpets from TauCetiStation
Original PR: TauCetiStation/TauCetiClassic#2989
Adds tables to match the carpets

Carpets Good. Tables Good.
Changelog

cl
imageadd: 8 new carpets and fancy tables
add: exotic carpet crate
/cl
2019-10-06 18:09:16 +13:00
Qustinnus
26a95ac867 Re-adds room beauty without the negative moodlets (#46848)
* re-add

* epic

* fix

* epic
2019-10-05 22:47:49 -04:00
Qustinnus
81c3d92129 Adds pick-up, drop and throw sounds for items. (#46677)
* finishes up

* adds sound volumes

* woops

* forgot to ctrl + s

* cloth

* smh

* done
2019-10-04 18:53:09 -04:00
subject217
ee94180e6f run_obj_armor copypaste removal part 2 (#46752)
* Removes outdated copypaste run_obj_armor behavior

Also removes some random behavior on camera and APCs that not only did not work but was added with zero justification in a refactor. No changes for players.

* screwdriver to wirecutters

forgot about this

* checks for broken
2019-10-03 02:23:35 -07:00
nemvar
daffaefb71 Switches out the three billion args of electrocute act for flags (#46564)
* Switches out the three billion args of electrocute act for flags

* Adds autodoc to electrocute flags, sets the boolean I removed and tries to fix the ed209 file

* tries to fix ed209 again

* Fixes 209 hopefully

* Finally fixes that darn file

* one final one to fix the diff

* Or i guess i'll just do it myself
2019-10-02 23:14:19 +02:00
skoglol
a7b02fb6c7 Removes air mix tanks (#46480)
* Removes air mix tanks.

* and the maps.
2019-10-02 12:01:23 +02:00
81Denton
23123404f4 Chameleon projector exploit fixes (#46827)
* Stops Chameleon projectors from scanning stealth implant boxes

* Also stops holosign scanning

* Dab on mimes

* Replaces mime typepath checks with alpha/invisibility checks

* Alpha/invis checks

* Removes typepath check
2019-10-01 16:56:03 -04:00
Firecage
b18e8ba52b Makes Plastitanium Windows deconstructable and children of Reinforced Windows. (#46679)
* Makes plastitanium windows children of reinforced windows.

* Unanchored variety isn't fully tooled in now.

* Path moved to plasma/reinforced/plastitanium

* Fixes a blunder about neglecting a mapping path change.
2019-09-25 18:25:48 -07:00
subject217
bd3bc5463b Removes irrelevant damage deflection code from secure_closets.dm (#46720)
Did I test it? No I didn't.
2019-09-25 16:46:17 -04:00
Rob Bailey
7d7a1e72d9 Gun sound revamp (#46689)
* shitload of new sounds

* dme fix

* file fixes

* more file fixes

* more file fixes

* volume tweaks + better pistol sounds

* more new sounds + no through walls suppressed

* better suppressed

* more work

* pistol handling sounds

* small tweaks
2019-09-24 18:01:27 -04:00
spookydonut
8b339f7f94 creamed component (#46496)
* creamed component

* creamed no

* make use of unused sprites

* applies to all living

* params

* changes from review
2019-09-24 17:17:33 +02:00
nemvar
dc783795db Renames is_hot and is_sharp to get_temperature and get_sharpness (#46680) 2019-09-23 14:02:59 -07:00
Qustinnus
20397d59f1 [READY] Roulette wheels (#46418)
* Basic roulette interface

* at least it compiles

* roulette

* fixes jackpot sound

* beacon

* epic

* push

* Update code/game/machinery/roulette_machine.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* sprites and more audio

* color

* Woops

* epic

* wires

* sprite

* Nya mergies pwease OwO (#17)

* Moves style to .styl

* test

* Fixed

* da real shiet

* fix

* fix

* fixes

* woops

* assets

* stop github stop

* fix

* static

* nya (#18)
2019-09-20 12:21:49 +02:00
nemvar
8cfe0f6467 Slightly improves visible and audible messages. (#46499)
* Doubtful improvement

* Switches out all the magic numbers with defines

* Thanks travis for finally finding a real error

* properly resolves some left over conflict
2019-09-18 12:52:18 +02:00
variableundefined
900483ba44 Remove redundant structure/chair/wood/normal typepath (#46443) 2019-09-15 00:29:23 -07:00
kingofkosmos
8358169b8e New 'hear' span class (#46369)
* Reverts italics-span back to no color.

* Cleans up many extra spaces and indents.

* Adds 'hear' span class.

* Replaces all 'italics' used in heard messages with 'hear'.
2019-09-14 23:56:34 -07:00
Rodey125
91004b5cc9 Pets can no longer nuzzle grilles into oblivion (#46430) 2019-09-14 22:13:56 -07:00
Fikou
259ebdcc5d makes bonespear a child of spear and MAKES THE DAMAGE MORE CONSISTENT (#46467)
* who did this

* boner

* a

* a

* hhhhhhhhhhhhhhhhhhhhh

* a

* a

* Update recipes.dm

* hhhh
2019-09-13 18:36:10 -04:00
Krysonism
747b73a824 October comes early! Revolutionary art and bust. (#46163)
* Marx bust + rev art component

* Fixies

* -f
2019-09-12 12:43:05 +02:00
Rob Bailey
776d89e2af Reinforced windows are a little easier to get through. (#46335)
* decon nerf

* armor nerfs
2019-09-10 16:24:52 -04:00
tralezab
81193925a1 Transit tube dispensers for JOHN GOBBEL on DISCORD.GG (#46344)
* relic file

* Revert "Merge branch 'master' of https://github.com/tralezab/tgstation"

This reverts commit 826916d87b421dbb0ebcfce7fad96e456b6d3674, reversing
changes made to a0f476d874.

* transit dispenser

* that should be all

* sprites

* true falses, dmi fixes
2019-09-10 02:41:21 -07:00
bgobandit
68aade356c Adds The Goose bar sign, inspired by Yog. (#46321)
* ports bar sign from yog, adds deep lore

* adds changes by plapatin himself

* made the animation have a bit more of a pause
2019-09-06 16:37:58 -07:00
cacogen
1f010e7144 Selectively randomisable characters (#46108)
* Selectively randomisable characters

* it's a list now

* this doesn't work

* it's totally fucking fucked mate big time

* it works

* so sick of this goddamn pull request and yes i know this is a retarded way to do this it didn't work the other way

* anturk forestalls the inevitable suicide

'associative lists are more performant'

* final changes anturk requested

'remove all the "in randomise" and it's ready'
2019-09-06 08:50:12 +02:00
AnturK
7bd1db3e34 Adds simple voting box. (#46153) 2019-09-02 23:55:31 -07:00
skoglol
86839addb9 Pulling lockers now slow you down. (#46216)
Pulling lockers now slow you down.
2019-09-02 18:32:54 -07:00
bgobandit
c606522bec Non-tagger graffiti counts as bad art (and other art adjustments.) (#46248)
About The Pull Request

    Non-taggers' graffiti counts as bad art. Taggers' graffiti counts as good art, not great art.
    Makes the art defines global defines and removes some magic numbers.
    Re-orders the switch statement for art to go ascending instead of descending, because otherwise if something is at BAD_ART it will register as good instead, if it's at GOOD_ART it will register as great, etc., which defeats the purpose of having defines.

Why It's Good For The Game

The tagger component: Because there isn't really much bad art in the game ,and graffiti is as obvious a candidate as any, and gives the janitor an actual excuse to remove it besides being a dick. If you don't want the potential for a bad moodlet, don't examine the art. You have to go out of your way to do so anyway.

Very slightly nerfing tagger graffiti: Because "what a thought-provoking piece of art" is kind of much for graffiti.

The other component: Because there's no point in having defines if people are just going to put magic numbers everywhere anyway. (I left the impressiveness numbers for statues, etc. alone, because those can take damage, dropping their quality. But if something can't take damage, just use the define.)
Changelog

cl
tweak: Graffiti by a non-tagger counts as bad art.
/cl
2019-09-02 09:17:41 +12:00
Rob Bailey
2029163d33 playsound vary boolean define conversion (#46254)
About The Pull Request

Converts every single usage of playsound's vary parameter to use the boolean define instead of 1 or 0. I'm tired of people copypasting the incorrect usage.
Also changes a couple of places where a list was picked from instead of using get_sfx internal calls

This was done via regex:
(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\)) to match 1
(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\)) to match 0
full sed commands:
/(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\))/\1TRUE\2/ 1 to TRUE
/(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\))/\1FALSE\2/ 0 to FALSE

I'm not very good with regex and these could probably be optimized, but they worked.
Why It's Good For The Game

Code usability
2019-08-30 18:45:20 +12:00
kingofkosmos
df1fecc58c Adds notice-span to visible_messages with no spans (#46044)
About The Pull Request

Adds 'notice' span class to all visible_messages which had no span class, making all those black messages blue.
Why It's Good For The Game

This should help differentiate action-messages from talking-messages in the chat. More actions will be blue, thus black talking-messages should pop out more.
2019-08-26 20:50:00 +12:00
Rob Bailey
26b04ede42 Obliterates item_color: new washing machine functionality edition (#45961)
About The Pull Request

Completely removes item_color and the clusterfuck of bad programming it caused.

In places where item_color was used for entirely unique purposes it was split off and renamed to a new var on that typepath only, or refactored so it wasn't needed

In places where item_color was used as a dye color, it was converted to the new dye_color var

In places where item_color was used as the worn overlay it was removed and instead now icon_state is always used as the clothing overlay.

A new mob_overlay_icon var was added for manually setting where the mob overlay icon path is for specific items.

Moved some mob overlay files relating to clothing to their own directory as well for organization purposes.

Totally refactors washing machines, instead of the horrible abortion that was iterating through the typepath it now uses a registry of dye results.

Some bonus functionality to come out of this:
the washing machine now supports arbitrary dye colors.
Why It's Good For The Game

It's been 4 years since the "this should be deprecated soonish" comment was added, and this var is a shitpile of confusion if you just trace the usage of it.
Changelog

cl
add: Washing machines now support arbitrary dye color
add: Washing machines now dye nearly every item.
refactor: lots of backend changes to clothing overlays, report any issues
/cl
2019-08-26 20:38:11 +12:00