Commit Graph

4949 Commits

Author SHA1 Message Date
81Denton
dce27bac3d Merge pull request #47492 from MrPerson/material_color_improvments
Improved material colors
2019-11-01 10:42:27 +01:00
Jordie
9e51183ca2 Merge pull request #47487 from PepperPrepper/patch-1
Fixes a Space in An Achievement Description (ATH Approved)
2019-11-01 19:48:51 +11:00
MrPerson
9e204afd58 Material fixes based on feedback 2019-11-01 03:00:05 -05:00
Emmett Gaines
2e956adfd0 Makes a generic recursive movement tracker (#47241)
* Makes a generic recursive movement tracker

* Cleans up the tracker datum in orbits

* Untracks the old tracked object if track() is called manually

* Makes the orbiter component clean up the tracker properly
2019-10-31 17:36:05 -04: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
Loomin
d259ad67aa Allows ATH1909 to be immersed in real life again
(fixes a space in an achievement description

Fixes #47449
2019-10-31 12:56:57 +11:00
Time-Green
8393e52a4e Optimizes duct reconnecting (#47434)
* optimizes duct connecting

* i hang myself on live television

* yippa ka yay
2019-10-30 16:31:17 -07:00
moo
61f69ac5eb Moves Achievements to OOC Tab instead of reserved slot (#47471)
* Update _achievement_data.dm

* Update _achievement_data.dm
2019-10-30 16:14:18 -07:00
XDTM
c580639c3c Nanites that don't sync regularly have a chance of software er… (#47470) 2019-10-30 16:13:15 -07:00
XDTM
a3aa020af3 Makes nanites more accessible, giving them a separate research… (#47421) 2019-10-30 16:12:38 -07:00
Rob Bailey
3050681ece fixes uplinks not showing role/race restricted items (#47463)
* fixes uplinks not showing role/race restricted items

* come back

* and then the dme freaks out
2019-10-30 09:33:07 -04: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
Arkatos1
59b720dec7 Pie face fix (#47314) 2019-10-27 16:30:30 -04:00
Rob Bailey
237f269fe5 Adds nanite program rules, disables program installation from the chamber, makes chamber able to destroy nanites (#46918)
* nanite rules

* cloud tweaks, new programs

* techwebs

* tgui rebuild

* Display fixes, removes cloud sync stuff

* fix

* Addresses review

* lf?

* Fix
2019-10-27 02:04:51 -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
XDTM
e8d9e915b6 Merge branch 'master' of https://github.com/tgstation/tgstation into ThisRULES 2019-10-26 17:47:59 +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
oranges
58d8c248c8 Merge pull request #47388 from Rohesie/path
Variable definition path cleanup
2019-10-26 21:20:24 +13:00
oranges
65e5fb986e Merge pull request #47382 from actioninja/lesslogspam
less log spam to mat explosions
2019-10-26 21:18:13 +13:00
nemvar
372189aad8 Prevent prevent contents explosion proc (#47337)
About The Pull Request

Proc literally only existed to return a boolean. Contents explosion is a clusterfuck anyhows. Basically it works something like this:

If the turf is the epicenter: GetAllContents of the contents and call ex_act on them directly. But it doesn't get the contents of whatever returns true on prevents_contents_explosion.
Otherwise: Call ex_act on the turf which calls the contents_explosion proc which has nothing to do with the prevents_content_explosion proc.

This is barely the smallest droplets of water onto a hot stone.

PR replaces the proc with a bitflag in flags_1.
2019-10-26 21:05:25 +13:00
py01
be5514909b debug uplinks show all restricted items (#47374) 2019-10-25 16:40:13 -07:00
Shaps
708c7df7ab Intern Horde take 2 (#47263)
Intern Horde take 2
2019-10-25 11:18:25 -07:00
Time-Green
47f9227804 Materials now use color matrices (#47248)
* uses color matrices to make material colors sexier

* Adds comment about color matrices
2019-10-25 02:41:32 -07:00
4dplanner
2dc4bcad70 set parent.orbiters on register (#47344) 2019-10-25 02:35:14 -07:00
L
42873d424e Cleanup 2019-10-25 04:26:09 -03:00
actioninja
d4ada061a1 less log spam to mat explosions 2019-10-24 18:21:42 -07:00
TheChosenEvilOne
e0bcd2538f [Ready] Deadchat control component, also a chance for deadchat controlled birdboat. (#47110)
* Dead chat controlled singularity!
It just can't go wrong.

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

* Renames the input_cooldown var to make more sense.

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

* Begone ugly checks.

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

* oh yeah, I can just do this.

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

* Replaced the deadchat control with a component.

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

* Autodoc

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

* Removed the leftover global list.

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

* Possessed goose, bye singularity.

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

* vomit

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

* Deadchat plays singularity

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

* Removed global mode completely, also reviews.

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

* Reviews.

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

* alrighty then

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-10-23 22:00:22 +02:00
Fikou
81c9ce06d8 brings back the clown planet as a new space ruin (now with a sense of style) (#46953)
* nice

* aw

* planet of the clown

* cluwne

* bruh

* a

* awoo

* awwwwwwwwwwwwwwwwwwwwwwwwoooooooooooooooooooooo
2019-10-22 20:14:14 -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
IndieanaJones
ee2c658098 [READY] Adds Pulsating Tumor Ruin and Lavaland Elites (#46566)
* Adds elite.dm and elite_goliath.dm

* Add lavaland_surface_elite_crevice.dmm

* Load elite.dm and elite_goliath.dm

* Add Glowing Crevice Ruin

* Add elite_lavaland_monsters.dmi

* Additional Sprite to artefacts.dmi

* Updated elite_goliath.dm and elite.dm

* Add actions_elite.dmi

* Cleaned up Code with help from reviewers

* Getting Jiggy with timers

* Update lavaland_surface_elite_crevice.dmm with MapMerger

* Update actions_elites.dmi for Pandora

* Add pandora.dmi

* Remove Old Icons File

* Update elite.dm, elite_goliath.dm.  Add pandora.dm

* Load Pandora.dm

* Update actions_elites.dmi

* Add legionnaire.dmi

* Update Old Files, add legionnaire.dmi

* Load legionnaire.dm

* Update All Files, Add herald.dm

* Update actions_elites.dmi

* Update legionnaire.dmi, Add legionnaire_bonfire.dmi and herald.dmi

* Load herald.dmi

* Delete elite_goliath.dm

* Update elite.dm, pandora.dm, legionnaire.dm, and herald.dm.  Add goliath_broodmother.dm

* Delete lavaland_surface_elite_crevice.dmm

* Add lavaland_surface_elite_tumor.dmm

* Update lavaland.dm

* Delete elite_lavaland_monsters.dmi

* Delete herald.dmi

* Delete legionnaire.dmi

* Delete legionnaire_bonfire.dmi

* Delete pandora.dmi

* Add lavaland_elites.dmi

* Add tumor.dmi and legionnaire_bonfire.dmi

* Update actions_elites.dmi

* Stop loading elite_goliath.dm, start loading broodmother.dm

* Load goliath_broodmother.dm, not broodmother.dm

* Update all Elite Files for Loot Drops

* Add elite_trophies.dmi

* Add hope sprites to accessories.dmi

* Update neck.dmi

* Update elite.dm

* Update screen_objects.dm

* Add lavaland_elite.dm

* Add screen_elite.dmi

* Load Lavaland Elite HUD

* Update actions_elites.dmi

* Change the Death-Detection to be Tumor-Based, not Elite-Based

* Fixing a few rare runtimes

* Update herald.dm to comply with the obj/projectile change

* Ups the cost of the tumor ruin from 0 to 5

* Implement fixes suggested by AnturK

* Compliance to the new curazzy mob verb system

* Recompliance the whole projectile change thing

* Fixed Up Elite Files Based on Antur's Suggestions

* That's why shooter was needed

* Let's get rid of shooter

* Commit changes suggested by Fox-McCloud

* Forgot a )

* Remove a H.

* Update elite.dm, herald.dm, and pandora.dm

* Add Hope's positive mood effect

* Consider neck slot item when calculating armor and for block chance

* Fix human_defense.dm

* Fix Inconsistent Indentation

* REALLY Fixin' that Indentation

* Had to find some obscure thing to fix so Travis would check us out

* While we're still here, fix this off-pixel

* Background icon fix

* This somehow got left out during the changes

* Update to elite files

* Update the Description of the Herald
2019-10-22 14:58:08 -07:00
XDTM
9e0fd9fc5a Merge branch 'master' of https://github.com/tgstation/tgstation into ThisRULES 2019-10-22 22:46:07 +02:00
nemvar
58d961dc61 Ghosts can no longer see moodlets via observe. (#47229)
About The Pull Request

Prevents ghosts from getting a detailed moodlet readout.
They can still see the face, so in most cases observing for a prolonged time will probably give you a good indication of their antag state. Though I would consider that a fairly small concern in comparison to a surefire way to find antags.
Fixes #42202
Changelog

cl
fix: Ghosts can no longer receive a detailed readout of a persons moodlets with the observe verb.
/cl
2019-10-23 09:08:53 +13:00
spessbandit
e3d1e5c53e ghosts can't use monitors; dextrous animals can climb crates; fixes atrocious spelling (#47262) 2019-10-22 04:37:35 -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
nemvar
ac075a56f0 Fixes various skill bugs. (#47279)
* Having none skill whatsoever will now give you the worst possible skill modifier.
Viewing your skills is now formatted correctly.
Skill names are now capitalized. Looks slightly better.

* fileendings

* Needs to check for null this one.

* Newline
2019-10-22 04:20:53 -07:00
XDTM
efe63e3b47 Nanite program rebalancing, added two new mood programs (#47227)
* Nanite program rebalancing, added two new mood programs

* stealth immunity
2019-10-21 22:09:42 +11:00
Jordie
66d1ae42f5 Merge pull request #47133 from XDTM/NanoSecrets
Adds the Reduced Diagnostics nanite program
2019-10-21 21:47:18 +11:00
Bobbahbrown
1abf64574b Fixes Runtime with Determining Resource Amounts in Items (#47237)
* runtime begone

* web edit to take ninjas recommendation lol

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>
2019-10-21 21:44:55 +11:00
81Denton
f5bd6a381d Merge pull request #47052 from kingofkosmos/misc_span_fixes1
Misc span fixes
2019-10-20 18:46:54 +02:00
81Denton
f76939795f Merge pull request #47225 from KetasDotepasto/ket-splitterFix
Plumbing: Fixes the splitter not switching.
2019-10-20 15:09:41 +02:00
81Denton
1c918f410e Merge pull request #47226 from nemvar/smonktime
Smonktime
2019-10-20 15:08:58 +02:00
XDTM
27c91be832 Merge branch 'master' of https://github.com/tgstation/tgstation into ThisRULES 2019-10-20 12:18:16 +02:00
81Denton
59432da72e Merge pull request #47190 from Time-Green/plumbing-fixes
Plumbing fixes and tweaks
2019-10-20 12:04:32 +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
nemvar
fb7c09e81a Neck Slice no longer divides by zero. (#47188)
* No more division by 0

* unepic spelling error
2019-10-19 22:34:12 -04:00
kingofkosmos
56b8461580 Fixes. 2019-10-19 22:17:50 +03: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
nemvar
39f6d36d5a Minor fuckup fixed. Comment readded. 2019-10-19 14:48:58 +02:00
nemvar
1ca1e9c6d1 Smoker runtime fixed once and for all. 2019-10-19 14:47:33 +02:00
Ketas Dotepasto
ddaed83398 Fixes the splitter not switching.
Fixes the problem that the splitter does not switch back to sending
chemicals straight. This resulted in the splitter sending chemicals
straight exactly once, then forever sending them to the side.
2019-10-19 13:49:42 +02:00