Commit Graph

12553 Commits

Author SHA1 Message Date
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
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
Emmett Gaines
9f333af3e5 Makes an update_overlays proc to manage overlays added by update_icon 2019-10-18 16:07:43 -04:00
kingofkosmos
cd0ddd0b75 Makes the health analyzer round the damage values up. 2019-10-18 21:09:55 +03:00
Qustinnus
472dd167ac fixes orm not giving mats and rods not having mats (#47163)
* o ok

* ok
2019-10-18 19:19:59 +02:00
nemvar
76409bf092 Examining things with a research scanner no longer runtimes 2019-10-18 13:26:26 +02:00
Graham
8eab1b8600 Inhand Sprite: Flamethrower lit animation/sound/light (#46975)
* emitter has wrenched state when created

* resync with master

* adds smokey animation to lit flamethrower

* More frames, less busy

* Fixed offset error for lefthand

* adds acti/deactivate sound for flamethrower

* offset fix

* adds ambient light when flamethrower switched on

* OFFSET BLARGH
2019-10-17 18:30:50 -07:00
kingofkosmos
01d0013809 Health analyzer font scaling hotfix (#47095)
Also rounds the damage numbers.
2019-10-17 18:24:13 -07: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
spookydonut
cca969feea change these away from defines (#47105) 2019-10-17 10:10:51 -04: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
Firecage
8dad3bf7f5 Leather crafting menu can be used again. (#47103) 2019-10-17 11:03:08 +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