Commit Graph

3435 Commits

Author SHA1 Message Date
py01
3d6a229d2f chef cqc table slam fix (#47718)
chef cqc table slam fix
2019-11-13 16:40:36 -08:00
spookydonut
dd6fa5eded More spawn/sleep removals (#47634)
* remove more spawns

* more

* more

* varsets

* oops

* unfuck this
2019-11-13 03:07:59 -08:00
Tad Hardesty
406cf1cd4b Mark airtight plastic flaps plural (#47687) 2019-11-11 11:52:15 -05:00
AnturK
c20b4d5ab2 Replaces lentext with length (#47585) 2019-11-07 11:42:33 -05:00
Ghom
f325b3e5a0 Fixing "walking down stairs shows falling message" (#47588)
* I'm too tired to even PR it atm.

* Update code/game/turfs/turf.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* Update code/game/turfs/turf.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* Update code/game/turfs/turf.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* atom signal, not movable.
2019-11-07 11:26:43 -05:00
Rob Bailey
13abb720b5 GPS, suit storage, and tank dispenser tgui-next (#47480)
* gps, suit storage, tank dispenser tgui-next

gps work

Final gps

suit storage + tank dispenser

* Improve GPS with direction arrows

- Added some collection manipulation functions
- Table is 100% wide by default

* Clamp GPS window height to safe range

* Calculate distance using vector maths on client side

* Remove logging

* More robust keying for GPS signal rows

- Protects from sorting glitches

* rebuild

* rebuild
2019-11-06 19:28:35 +01:00
spookydonut
2591ce17a6 Travis EOF newline detection v3 (#47539)
* scream

* aaa

* aaa

* new one
2019-11-04 19:16:50 -08:00
skoglol
43a41e35a7 Janitors start with holosigns again (#47513)
* Janitor start with holosign instead of barrier, barrier now only blocks carbons.

* And unconscious for the other ones too
2019-11-03 01:42:17 -08:00
81Denton
ab695c72a9 Fixes open space turf layering (#47501)
* Fixes open space turf layering

* typo
2019-11-03 01:53:39 -07:00
Firecage
e4330b63bb Fixes the issue of not being able to wash objects in sinks. (#47506) 2019-11-03 01:52:59 -07:00
ArcaneMusic
6e238392bf Adds several different uses for plastics (Cups, Utensils, Folding Chairs, Station Signs) (#47486)
* Initial PR, Cups, Utensils, Signs, Chairs

* Endline fixes for travis, adds plastic utensils to the initial node

* Makes bar invisible, addtimer added, fixes potential dmi/dm conflict

* Fixes Merge conflict take 2

* Wraps the chair snapping proc in invoke_async

* Cleans up Async Call a smidge
2019-11-02 20:30:35 +01:00
MrPerson
a0753d6ca3 Improved material colos
Gave better color matrices to some materials. Simplified some of the existing matrices down. Gave uranium a standard color since it didn't need a matrix. Made bananium obnoxiously bright. Made gold slightly less bright. Made diamonds somewhat brighter. Made glass actually look like glass, it was almost grey before wtf.
Improved some of the greyscaled sprites used by materials, many of them were too dark and/or straight reused from other things. Some of them weren't even grey come on guys.

I'll add some pics later.
2019-10-30 23:37:31 -05:00
kingofkosmos
8768b6b3b5 Removes unused & undefined spans (#47436)
* Removes all instances of 'caution', 'error' and 'notify'.

* Removes span classes which were either not used at all or were used very infrequently.
2019-10-30 02:00:11 -07:00
ArcaneMusic
f796acbaf8 Adds a new Lavaland Ruin, the Elephant Graveyard (#47325)
* Initial Commit, Features the Map, Map specific files, changes to a metric ton of icons, etc.

* Fixes merge conflict, actually adds the map

* Spelling is hard Part 1

* Alright, steps are bad. Got it.

* Clean slate, please pretend to compile

* dme issue

* Fixes it for lavaland elites PR

* Removes the last dirty step_x, removes duplicate file, makes treavor happy

* Fixes some newline issues.

* Fixes some types, spawns skeletons in select graves since mob_spawns kept shoving them outside.

* Makes bone statues and shovel actually craftable, cleans up some comments.

* Properly defines muddy paper, updates map, fixes a few more typos.

* Prevents some future turf atmos issues, finally touched up the two skull sprites.

* Refactors strong mineral drops, cleans up some duplicate code, prevents washing hands with OIL

* I swear officer, i'm a native english speaker, fixes remains dropping correctly, un-nests my Ifs further.

* Oil well now covers target in oil when interacting with it.

* Refactors sink deconstruction a bit, oil wells can't be constructed with a wrench.

* Cleans up some atmos, and adds a return

* Adds subtype of remains for use in graves, move their spawn to src, not loc

* Moves around remains spawn, gets rid of untouched var
2019-10-26 21:41:43 +02:00
Qustinnus
8a01398814 Adds achievement datums (#47058)
* First step

* achievements part 1

* epic

* done

* epic

* removes test datums

* adds minecraft achievement

* asss

* ass 2

* ass

* fix

* UPGRADE

* back-end partially

* back-end

* woops

* epic

* linted

* Achievements (#19)

* initialize SSachievements lists

* achievement ui actually tries to load

* witty commit description

* menu

* done

* done

* jesus christ

* ok linter

* Update code/datums/achievements/_achievement_data.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* Update _achievement_data.dm

* Update misc_achievements.dm

* Update achievements.dm

* Update

* And a space, goddamit!

* Rebuild tgui

* woops

* bruh moemnet

* ok conflicts

* finally
2019-10-26 05:57:42 -07:00
Arkatos1
5b2e71cff6 Toilet fixes (#47349)
* Monkey cube toiler fix

* Fingerprints
2019-10-26 00:41:58 -07:00
Kaffe-work
bb85177eed Locker bloat removal (#47252)
* Removes garbage from CE locker

* removes bloat from Cap/hos/hop lockers

* removes bloat from RD locker

* re-adds Advanced extinguisher

removed by mistake, mixed it up with the compact one you can have in your belt

* removes some more stuff from CMO

* gloves+oxygen removal
2019-10-26 00:31:14 -07:00
defiantGrace
21ccda7002 Makes toilets and sinks constructable (#47320)
* Makes toilets and sinks constructable

* Update code/game/objects/structures/watercloset.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>
2019-10-25 16:33:08 -07:00
81Denton
6b1161ecd9 Cleans up revive related procs (#47025)
* Cleans up revive related procs

* h

* fuck

* Fixes proc arguments

* Further fixes

* Unfucks line endings
2019-10-22 15:16:13 -07:00
genessee596
9cb5db5ba3 Removes all budget cards except for cargo card, gives cargo small steady income -- [ACTUALLY WORKS THIS TIME] (#47256)
Exact same as my earlier PR, but it actually works - [https://github.com//pull/47212]
Changelog

cl
del: Removed all departmental budget cards except for cargo card
tweak: Cargo now gets 500 credits per paycheck
balance: Cargo can't amass infinite money from other departments
/cl
2019-10-23 09:13:06 +13:00
carlarctg
6a65a85fe0 Reflector Trenchcoat replaces armory reflective vest (#47116)
* reflector vested

* denton REE

* Update hats.dmi

* a

* hmjhjmhfmjhmgfmjgm
2019-10-22 04:35:14 -07:00
skoglol
938e66f62c Adds sorting to most input() lists (#47117)
* Adds sorting to most input() lists.

* Sorted some global lists, added more input sorting

* Should now use correct sort everywhere.

* compiles

* Last fixes.
2019-10-22 04:28:42 -07:00
81Denton
f5bd6a381d Merge pull request #47052 from kingofkosmos/misc_span_fixes1
Misc span fixes
2019-10-20 18:46:54 +02:00
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
kingofkosmos
2b62c3b0c6 Somehow messed up previous resolve. Should be ok now. 2019-10-17 20:51:15 +03: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
kingofkosmos
52325eda25 Merge branch 'master' of https://github.com/tgstation/tgstation into misc_span_fixes1
# Conflicts:
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/structures/beds_chairs/chair.dm
#	code/game/objects/structures/lavaland/geyser.dm
#	code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
#	code/modules/antagonists/clockcult/clock_mobs/_eminence.dm
#	code/modules/paperwork/contract.dm
2019-10-17 06:02:06 +03: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
kingofkosmos
6d28a175d5 Fixes a few broken spans. 2019-10-13 21:51:07 +03: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
kingofkosmos
259626a8b4 Removes excess spaces in messages. 2019-10-13 14:36:43 +03:00
kingofkosmos
dba1d2eb2d Fail-messages from notice-spans to warning-span. 2019-10-12 21:24:52 +03:00
kingofkosmos
280d416d4f Adds missing spans, missing periods and missing span endings. Also changes spans to suit the situation better. 2019-10-12 19:34:11 +03: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