Commit Graph

8084 Commits

Author SHA1 Message Date
Neo
89299dd989 fixes (#47355) 2019-10-25 16:42:32 -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
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
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
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
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
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
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
spookydonut
cca969feea change these away from defines (#47105) 2019-10-17 10:10:51 -04:00
Firecage
8dad3bf7f5 Leather crafting menu can be used again. (#47103) 2019-10-17 11:03:08 +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
Fikou
340ba6f109 fixes cavity surgery with advanced cautery (#47109)
* shdghf

* c

* bitch
2019-10-16 17:13:02 -04:00
die
b9d6b766a1 Update scanners.dm 2019-10-16 17:02:09 -03:00
Time-Green
bca59b9a50 [READY] Plumbing: Endgame (#46759)
cl
add: Plumbing equipment is now available through the medical protolathe. It's under medical machinery boards
add: Add's a new chemistry area on metastation for chemical factories. It's located left of main surgery.
tweak: Chemistry has been turned into the Apothecary. It's basically normal chemistry, but Medical Doctors have acces aswell.
tweak: The smoke machine is now plumbing compatible. Put this knowledge to good use.
sprite: Thanks to @CRITAWAKETS for the plumbing RCD sprite!
/cl

Finally adds plumbing to the game!

Chemistry has been turned into the apothecary. For all intents and purposes it's old chem, but doctors have acces.

West of main surgery is now the new chemistry factory area.

I've also had to move stuff around alot, because you can't just add a big new room without having stuff in the way.

Currently only on metastation. I'm completely drained from adding it to meta alone and doing all maps right now will burn me out.
2019-10-17 00:10:30 +13:00
MadoFrog
f63bb8bf5a Adds Shrine Maiden's Outfit to the Costume Vendor (#47090)
* Adds Shrine Maiden's Outfit

* Adds the Shrine Maiden's Wig

* Adds the gohei as a null rod transformation

* Gives the gohei purification properties

* Shrine maiden's items now lack religious significance

There's a profound comment to be made here, but I'm not smart enough to make it.

* Icons added back after rebase

* Addresses requested changes

* Adds the gohei's hitsound

* Update suit.dmi
2019-10-15 21:41:23 -04:00
Tony
128cd843ee metal sheets build the normal metal table again (#47079) 2019-10-15 15:47:36 +02: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
die
b5c9c24697 Update scanners.dm 2019-10-14 01:01:06 -03:00
kingofkosmos
6d28a175d5 Fixes a few broken spans. 2019-10-13 21:51:07 +03:00
Fikou
31ab3ac830 power tool refactor (#46974)
Power tool refactor
2019-10-13 20:34:52 +02:00
carlarctg
5cbe594e9d Update singularityhammer.dm (#47040) 2019-10-13 19:44:37 +02:00
kingofkosmos
228b4282ca Merge branch 'master' of https://github.com/tgstation/tgstation into misc_span_fixes1
# Conflicts:
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/modules/mob/dead/new_player/new_player.dm
2019-10-13 15:21:17 +03:00