Commit Graph

12566 Commits

Author SHA1 Message Date
Arkatos1 4ef7301a63 Singularity hammer fix (#47438) 2019-10-30 02:02:45 -07: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
spessbandit 42766641f0 Buffs the mime. (Adds 30 new emojis, all emojis visible within PDA.) (#47420)
* buffs mime

* alphabetizes emoji list

* antur's redesign

* make that 24

* did I say 24 fuck that we're going 30
2019-10-30 01:55:03 -07:00
Couls 8c2a8680d6 Update shields.dm (#47458) 2019-10-30 01:51:53 -07:00
carlarctg b49d3bb4ac hello (#47357) 2019-10-30 01:47:25 -07:00
Firecage 34427d9872 Some bags and belts can hold more stuff. (#47318) 2019-10-28 17:07:58 -04:00
nemvar d4ea42c950 Xeno impreg now gets stopped by stasis (#47307)
* Xeno impreg now gets stopped by stasis

* holy fuck why does my editor do this?

* review change

* ree
2019-10-27 20:21:20 +01: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
oranges 58d8c248c8 Merge pull request #47388 from Rohesie/path
Variable definition path cleanup
2019-10-26 21:20:24 +13:00
Jeremiah Cooley 666b513c0e Field Generators block gasses and shield floors from melting (#46971)
About The Pull Request

Allows Field Generators and their containment fields to block Gasses when active. Field Generators now project shielding over the floor that prevents melting. Intended as a prelude to making turfs melt easier under high heat.
Why It's Good For The Game

Allows for setting up safe gas containment with some risk for containment breach.
Changelog

cl Jdawg1290
balance: Field Generators now block gasses and shield floors from melting when active
/cl
2019-10-26 21:09:33 +13:00
carlarctg bfc9c6ba81 Fixes candy cigarettes (#47332)
About The Pull Request

haha am stoopido :)
i fucked up with candy cigarettes like an idiot and didn't test anything
candy cigs now look like candy cigs and dont ahve broken sprites
Why It's Good For The Game

bug xies good
Changelog

cl
fix: candy cigarettes don't have broken sprites anymore
/cl
2019-10-26 21:07:09 +13: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
Neo 89299dd989 fixes (#47355) 2019-10-25 16:42:32 -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
genessee596 4250e1bd9e Adds generic gas tanks, constructable at the Autolathe (#47321)
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload
2019-10-25 02:43:50 -07:00
81Denton 8ad20f1001 Stops plumbing smoke from notifying admins (#47312) 2019-10-25 02:42:19 -07:00
Arkatos1 dabba37db2 Chameleon sprite fixes (#47322) 2019-10-25 02:36:39 -07:00
L 42873d424e Cleanup 2019-10-25 04:26:09 -03:00
skoglol 2dd01611fc Some input() sorting fixes (#47354)
* dynamic gamemodes

* Some input fixes
2019-10-25 03:15:26 -04:00
Cenrus 7eaade4d7f Fix abductor typos (#47350)
Fixes a small typo in the abductor console where the chemical dispenser 
was called "Reagent Synthetizer" instead of "Reagent Synthesizer".
2019-10-23 20:39:03 -07:00
Krysonism 678ff60bbd You've got to go back. (#47269) 2019-10-23 20:41:57 +02:00
tralezab fcf2dbfa02 [READY] Mime PDAs only accept emojis for messages, mime cartridge comes with an emoji guidebook (#47177)
* relic file

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

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

* mime pda

* hey maybe it works

* some steps forward

* IT WORKS HAHAHA YAAAAAAAAAAAAAAAAA

* logged properly in everything
2019-10-22 20:19:21 -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
spessbandit e3d1e5c53e ghosts can't use monitors; dextrous animals can climb crates; fixes atrocious spelling (#47262) 2019-10-22 04:37:35 -07: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
Jordie de85502ef9 Merge pull request #47199 from ninjanomnom/mom-says-update-your-icon
Makes an update_overlays() proc to manage overlays added by update_icon()
2019-10-21 21:12:51 +11:00
carlarctg fe65761c93 Candy cigarettes! + cig tweaks (#47143)
* Oh dude we got a fuckin coffee cheetos chickennnnnnnnnnnnn

* Update mask.dmi
2019-10-21 13:20:45 +11:00
die dd1437a3c4 Merge remote-tracking branch 'upstream/master' into oranges-no 2019-10-20 16:48:25 -03:00
Krysonism 59a0440acf Da white kit nerf update: sutures and regen mesh. (#47092)
* Base

* epic

* bandaid begone

* Documentation

* Bugmash

* Replaces bruise packs and ointment in on maps.

* Fixes for testmerge

* new line

* Dirty web

* Nasty webedit

* med suture is now a chemical recipe, adds cellulose reagent
2019-10-20 13:18:42 -04:00
81Denton f5bd6a381d Merge pull request #47052 from kingofkosmos/misc_span_fixes1
Misc span fixes
2019-10-20 18:46:54 +02:00
81Denton 49589a9dee Merge pull request #46933 from Krysonism/Somethingforthekids
[READY]Da food update. Donuts! New foods! Nuggbox! Bowl resprite.
2019-10-20 14:55:35 +02:00
81Denton 1a0428f031 Fixes cult space bases (again) (#47041)
* Fixes cult space bases (again)

* h

* Fixes duplicate definition

* Lets cultists draw runes at the Lavaland cult altar ruin

* Adds CULT_PERMITTED_1 flag to check if cultists can summon/buld structures here

* h
2019-10-20 14:47:14 +02:00
Krysonism c71d3a45d7 Update code/game/objects/items/storage/fancy.dm
Co-Authored-By: 81Denton <32391752+81Denton@users.noreply.github.com>
2019-10-20 14:35:58 +02:00
Krysonism 52cccbeae8 Update code/game/objects/items/stacks/sheets/sheet_types.dm
Co-Authored-By: 81Denton <32391752+81Denton@users.noreply.github.com>
2019-10-20 14:35:15 +02:00
81Denton 62a72c4fca Merge pull request #47186 from nemvar/anotherlenruntime
Examining things without material with a research scanner no longer runtimes
2019-10-20 14:20:29 +02:00
81Denton 85ee636d41 Merge pull request #47198 from kingofkosmos/healthanalyzer_ceilingfix
Makes the health analyzer round the damage values up
2019-10-20 14:18:46 +02:00
DeAndre a9b1ada28c Merge branch 'master' into Somethingforthekids 2019-10-20 13:26:13 +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
Tony 2f8ef2f725 fixes not being able to access medical first aid kits inside a bag (#47155) 2019-10-19 21:42:17 -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
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
Qustinnus b021210a2f [READY] Adds a basic skill framework to Physiology. (Only applied to mining) (#46913)
* levels

* mining

* ore exp

* fixes

* epic

* Update code/game/turfs/simulated/minerals.dm

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

* fixes message

* dumb

* shreet

* epic

* fix

* ass

* scrape

* fixes bugs

* fixes

* reset

* test

* ??

* ok bye

* fix

* Adds skills

* skill
2019-10-18 19:59:35 -04:00
moo 940606a239 Adds new bioluminescent traits and mutations (#46986)
* Adds new bioluminescent traits and mutations

Because 'puke green' shouldn't be the only light color.

* Adds new bioluminescent traits and mutations

Because 'puke green' shouldn't be the only light color.

* Adds new bioluminescent traits and mutations

Because 'puke green' shouldn't be the only light color.
2019-10-18 19:49:24 -04:00
Yaki 46d57ae96a Skeletons Can No Longer Be Hugged By Facehuggers: Take 2 (#46959)
* creates the xeno immunity trait for skeletons

* creates globalvar for xeno immmunity

* gives skeletons the xeno immunity trait

* makes the hugger check for xeno immunity

* checks for xeno immunity trait over embryo and hivenode

* adds the xeno immunity trait with hivenode

* adds xeno immunity trait when impregnated

* whoops fixed the number of macro args

* okay NOW it should be fixed

* there now it should b gucci
2019-10-18 19:46:13 -04:00
81Denton 6e4996e6e3 Merge pull request #47157 from Time-Green/plunger-masks
Adds plunger unicorns
2019-10-19 01:24:02 +02:00