Commit Graph

8382 Commits

Author SHA1 Message Date
Arkatos
995ccd9510 Rad laser UI tweaks 2020-03-05 13:32:56 +01:00
spookydonut
b95543d242 Map fixes, and 1-2 QOL improvements. (#49690) 2020-03-05 19:42:52 +08:00
spookydonut
319ca52545 removing unnecesary double parent proc calls (#49694)
* removing unnecesary double parent proc calls

* i made an oopsie
2020-03-05 18:51:37 +08:00
AnturK
6735128e96 Fixes coal stack icons. 2020-03-04 19:02:42 +01:00
Qustinnus
b70e5c360c Adds a license press for in perma brig (#49452)
* temp

* adds cargo stuff

* dots

* woops

* Update code/game/machinery/prisonlabor.dm

Co-Authored-By: Jordan Brown <Cyberboss@users.noreply.github.com>

* fixes

* Update code/game/machinery/prisonlabor.dm

Co-Authored-By: Jordan Brown <Cyberboss@users.noreply.github.com>

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-03-04 23:19:21 +08:00
Qustinnus
4b2a8aebe5 [READY] Meat material & material datum turf support (#49402)
* temp

* meatwalls

* more

* adds sheetifier

* fix

* two

* mat texture + 4dplanner admin (#21)

* mat texture + 4dplanner admin

* keep together trait

* counter instead of trait

* finalizations

* woops

* fixes

* oopsie

* only set starting keep_together if necessary (#24)

* keep together as trait again

* remove false comment

* doc for TRAIT_KEEP_TOGETHER

* remove needless scoping

Co-authored-by: 4dplanner <3combined@gmail.com>
2020-03-04 23:18:08 +08:00
nightred
15452cac44 [READY] Two Handed Component (#49422)
About The Pull Request

For an item to be two handed just add this handy component.

All existing two handed items have been converted to use this component.
Why It's Good For The Game

It has components and signals, and now you can make items two handed so simply.

/obj/item/shockpaddles/ComponentInitialize()
	. = ..()
	AddComponent(/datum/component/two_handed)
2020-03-04 11:26:01 +13:00
skoglol
69745adfad Merge pull request #49628 from Mickyan/broom_inv_fix
Fixes brooms messing with inventory
2020-03-01 15:21:28 +01:00
skoglol
50e373d597 Merge pull request #49640 from Mickyan/gum_size
Makes gum boxes tiny items
2020-03-01 15:17:58 +01:00
skoglol
2f1ebf83e5 Merge pull request #49524 from necromanceranne/let-sleeping-carp-lie
Sleeping Carp: Scaled Skin Edition
2020-03-01 01:07:33 +01:00
skoglol
cc7391ee3b Merge pull request #49613 from SteelSlayer/airlock-painter-improvements
Airlock painter code improvements. Fixes some mixed up in-hand sprites for it
2020-02-29 22:50:59 +01:00
Mickyan
4cc8832299 gumbox size 2020-02-29 14:46:01 +01:00
Mickyan
c0be6d966a broom fix 2020-02-29 02:13:54 +01:00
ShizCalev
9054a4c201 Merge pull request #49596 from ArcaneDefence/Carp_classic_fix
Carp classic carpotoxin fix
2020-02-27 23:36:58 -05:00
ArcaneDefence
84b1dff5e0 Update cigs_lighters.dm 2020-02-27 15:52:05 -07:00
SteelSlayer
5ee0cf0f32 airlock painter 2020-02-27 15:17:06 -06:00
TWATICUS
8facec32c9 bola time 2020-02-27 09:48:25 -05:00
ArcaneDefence
edf74e5c05 Update cigs_lighters.dm
Fix for https://github.com/tgstation/tgstation/issues/49588
2020-02-26 17:45:16 -07:00
skoglol
2220049fc2 Fixes blindfolds not properly counting as being blind (#49541)
* Fixes blindfolds not properly counting as being blind

* Call the proper proc
2020-02-25 19:15:33 +01:00
necromanceranne
24f087c9cf Merge branch 'master' into let-sleeping-carp-lie 2020-02-26 02:55:05 +11:00
ArcaneMusic
59ff677b9d Initial Commit. (#49484) 2020-02-25 16:34:30 +01:00
ArcaneMusic
94f27c7b25 [READY]Arconomy: Sales Taggers, split profits on barcoded, sold items! (#49111)
* Startwork

* "Arcane: Everything works up until the export datum bullshit"

* I got up to "Split Profit" in "sell object"

* This is when I switched over to components and it STILL doesn't work

* alright stopwork for the 'night'

* So this is the version that crashes

* One step further in my descent to madness.

* Alright, this should be working (Minus maybe profit_split)

* Alright splitting up custom sales splits is broken right now.

* Profit split works now.

* Alright what the hell is going on here.

* Revert "Alright what the hell is going on here."

This reverts commit 6cb3b6eb56ea45ede3496bbe219ca18302c806e2.

* Oh wait, I can do commit messages through VSC?

* Adds a quick little box with all the shipping supplies you'll ever want, unwrapping signal

* Added shipping box to all maps and the service/cargo lathes.

* Fuck you mapmerge hook you ain't shit

* Alright, yet another take of making it get rid of the pricetag

* [3:43 PM] oranges: anturk is smart (This is true)

* Tested, cleaned up component procs,  and limits signals sent a bit.

* Whoops

* Other comments from Ninja over discord

* Left in a comment line.

* Fixes the issue with ind. barcodes, adds examine.

* Well thank GOD the children wern't there to see it

* Adds a do_after to prevent accidents.

* Fixes merge conflicts

* Fixes merge conflict. Twice in one day.

* Fixes merge conflict.

* one tiny bit of documentation

* Travis play nice.
2020-02-25 20:42:01 +08:00
necromanceranne
a3a8a91cc8 I tested block in a few spares and it was too easy to just sit behind it and tank if they had a baton 2020-02-24 22:32:30 +11:00
spookydonut
1a9ddbee5f Merge pull request #48959 from Ryll-Ryll/embeddead
Refactors embedding, adds harmless embeds, sticky tape, admin buttons to make everything embeddable
2020-02-24 15:43:36 +08:00
ShizCalev
0228bc2fbe Call the proper proc 2020-02-24 01:31:38 -05:00
ShizCalev
df81c5be4a Fixes blindfolds not properly counting as being blind 2020-02-24 01:10:34 -05:00
Ryll-Ryll
6d379bf62b fixes a few bugs 2020-02-24 01:09:36 -05:00
necromanceranne
044f065a68 bullet swatting 2020-02-24 12:23:10 +11:00
necromanceranne
dc3a5b33cb Some additional adjustments 2020-02-23 22:50:50 +11:00
Ryll-Ryll
7e384752e6 moves topic, cleans code, adds sticky tape to maint loot 2020-02-23 06:50:18 -05:00
Arkatos
988b2b5f36 Tweaks and fixes 2020-02-22 17:33:12 +01:00
Arkatos
4a778725df Electropack UI 2020-02-22 15:53:38 +01:00
ShizCalev
4316f79d32 Fixes some inconsistencies with CentCom & Nanotrasen capitalization, and a couple typos (#49469)
typo fixes, inconsistencies with Nanotrasen capitalization, ect
2020-02-22 22:35:53 +13:00
moo
0133414559 Cobbduceus: (Baby) C2 Additions (Rhig,Troph) and Changes (Helbital) (#49356)
It's the year of the rat sisters, and now it's time to cut out those pesky C3s in your life!

Why It's Good For The Game

Rhig and Troph are no brainers considering they're on the same level of ease2make as the C2s and have no downside. They will still be good but they have some C2 component now. Kinda minor compared to the others but I'll see how it plays out.
Changelog

🆑
balance: Helbital now is more simple to use and is based off not crit/softcrit/hardcrit. You want to be in hardcrit for the best brute healing.
tweak: Troph has now been converted into a C2 with tweaks, now named Probital. Same recipe. Downside is stamina damage
tweak: Rhig has now been converted into a C2 with tweaks, now named Hercuri. Same Recipe. Downside is it can cool to dangerous levels.
/🆑
2020-02-22 22:24:36 +13:00
XDTM
ef5ef2d463 Adds a hypnotic flashbang to the uplink (#49137)
Adds a hypnotic flashbang, disguised as a regular flashbang, to the traitor/nuke op uplink. Pretty much an AoE one-use hypnotic flash, but it doesn't require weakening the targets as long as they can be affected by the sound of the grenade, since it causes minor hallucinations.
Why It's Good For The Game

Effectively this is a non-lethal, non-destructive chaos-making tool. Even without the hypnosis it's a better flashbang; if everything goes right you've got a roomful of followers obeying your orders, but on the other hand something might go wrong, and then Poly is the one with the roomful of followers.
Changelog

🆑
add: Added a hypnotic flashbang to the uplink for 12 TC. It can hypnotize people much like a hypnoflash, and the sound will automatically make victims vulnerable to the trance.
/🆑
2020-02-22 22:13:27 +13:00
Ryll-Ryll
cb3b82bdc1 lets you update embedding behavior, also makes red pens faster 2020-02-22 02:15:19 -05:00
ShizCalev
12bf56f5df Merge pull request #49449 from XDTM/deadNdeaf
Makes sixth sense only able to hear regular deadchat
2020-02-20 22:56:16 -05:00
ShizCalev
f54e26fefa Merge pull request #49431 from Mickyan/chewing_gum
Adds bubble gum
2020-02-20 22:53:33 -05:00
Mickyan
cebc8d428e Merge branch 'master' of https://github.com/tgstation/tgstation into chewing_gum 2020-02-20 16:09:01 +01:00
Arkatos
0b11eeb09a Conflict resolution 2020-02-20 13:50:13 +01:00
Bobbahbrown
476399a346 the span of these changes is immense (#49432) 2020-02-20 13:48:13 +01:00
Arkatos
1bd1ecb22e Review fixes and conflict resolution 2020-02-20 13:45:31 +01:00
spookydonut
6401ba5708 Merge pull request #49421 from ShizCalev/define-cleanup
Cleans up redundant math defines
2020-02-20 19:32:36 +08:00
XDTM
19655de8c7 Makes sixth sense only able to hear regular deadchat 2020-02-19 18:57:22 +01:00
ShizCalev
f8ecffdebe Merge pull request #49245 from itseasytosee/Holster_timeishere
[READY] The holster overhaul is here.
2020-02-18 23:57:58 -05:00
ShizCalev
33dcbb1315 Merge pull request #49438 from tralezab/patch-82
omega soap suicide
2020-02-18 23:48:39 -05:00
ShizCalev
326b93a104 Merge pull request #49334 from Mickyan/paramedic_loadout
Tweaks paramedic loadout
2020-02-18 23:36:53 -05:00
ShizCalev
eb1ebaaad3 Merge pull request #49350 from Iamgoofball/you_son_of_a_bitch_im_in
Adds more flavor to conversion.
2020-02-18 23:32:58 -05:00
tralezab
4a3470f202 haha funny line 2020-02-18 20:02:03 -08:00
ShizCalev
722da36291 Merge pull request #49413 from Arkatos1/LaserUI
tgui: Radioactive Microlaser
2020-02-18 22:52:29 -05:00