Commit Graph

24895 Commits

Author SHA1 Message Date
Arkatos
995ccd9510 Rad laser UI tweaks 2020-03-05 13:32:56 +01:00
spookydonut
49eab491b4 Gamer skill (#49618)
* gaming.dm added

* initial changes

* gamer god trait

* finalization after testing

* spellcheck + flavortext

* phone gamer support

* incorporates review suggestions

* tiny flavor change in pwr game desc

* more trait-related touchups and minor fluff

* adds and removes ?s where needed

Co-authored-by: spookydonut <github@spooksoftware.com>
2020-03-05 20:06:33 +08:00
spookydonut
5871a9a722 Small usability addition to Genetics DNA console interface. (#49689)
* Small usability addition to Genetics DNA console interface.

* Highlight individual gene buttons that are incomplete
2020-03-05 19:44:27 +08: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
actioninja
637d251e26 icon fixes 2020-03-03 19:50:25 -08:00
MMMiracles
af69a5a254 Donut-Z Fixes (#49679)
Fixes #49674
Fixes #49658

The different layered wiring was from something I failed to clean up afterwards, that was a mistake on my part. Some SMES' have also been moved to properly connect in and out so places like the AI core aren't dying 10 minutes in.

I heard someone complain about the power relays not sending power without people interacting with them initially but they seemed to be pushing power through just fine locally so I'm not 100% sure on that.
2020-03-04 11:35:26 +13: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
Rob Bailey
1aeb72b2a9 Better glowing lights (#49454)
* better glowy lights

* phase 2

* some doc comments

* working emissive blocking

* flag so these rotate correctly

* full brightness screens

* doc comments and rename

* better doc comments

* stub overrides

* better autodoc format

* Update code/game/atoms_movable.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* Update code/modules/lighting/emissive_blocker.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* render target defines for all planes

* update proc for emissive blocker

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2020-03-03 11:50:19 -05:00
Ryll Ryll
001cc78141 fixes issues (#49663) 2020-03-03 18:03:48 +08:00
zxaber
de3b9a04ee Ash Walker flavor text, balance changes (#49316)
* Ashen One

May the flames guide thee

* Update code/game/objects/structures/ghost_role_spawners.dm

Co-Authored-By: XDTM <heliumt@yahoo.it>

* update

* caught it before I got yelled at

* updates

* Update code/game/objects/structures/ghost_role_spawners.dm

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

* Update code/game/objects/structures/ghost_role_spawners.dm

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

* spaced the spaces

tab good space bad

Co-authored-by: XDTM <heliumt@yahoo.it>
Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-03-02 19:25:33 -05:00
skoglol
a57602b0a8 Merge pull request #49599 from ExcessiveUseOfCobblestone/metal-plates
Defib mounts are now roundstart but do not recharge. Rechargable variants still exist.
2020-03-03 01:01:35 +01:00
moo
413e85bb52 Update code/game/machinery/defibrillator_mount.dm 2020-03-02 18:53:46 -05:00
ExcessiveUseOfCobblestone
31e9cf53f8 deconstruct 2020-03-02 16:55:33 -05:00
ArcaneMusic
bdac280ed8 Fixes a minor issue with food in vend-a-trays not being purchasable. (#49648)
* Speedfix.

* Remove commented out code.
2020-03-02 21:12:46 +08:00
MMMiracles
f739e80649 Double-Decker Donut Disaster (Multi-Z Donutstation) (#48781)
* uhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh

* upper staircases, lots of upper floor work

* railings

* ai sat rework, exterior decals

* ass ass ASS ASS fuckin ASSSSS

* oh my god its full of stairs

* forgot a file oop

* railing fix on multiz test, upper atmos, external space dust deterrents

* both-way rail climbing, maint work, 2nd story atmos desk, pipe/wiring/ allow floating over openspace and moving up-down openspace in nograv, trailing ends

* go NORTHWESSSST

* maint work, hull work, gamer time

* upper security, more maint work, eva catwalks, less retarded railings, hiding signs from openspace, elevators suck, wire/pipe work

* more maint work, decal work on 1st floor, called my parents they appreciated it

* multiz test shit

* maint work, hallway work, botany work

* removed cloning, turned into general treatment, added small temp corpse storage next to treatment

* eduititititit

* gamers

* openspace fixes

* os over os fix

* prison rework, hallway work, pr prep

* mapmerge + remove pixel 0s

* bad area and more railings, newline

* unnecessary vis flags and unused computer console

* public mining dock

* oops lol

Co-authored-by: Dennok <Deneles@yandex.ru>
2020-03-02 03:44:59 +08:00
Dennok
fb85fc782b [READY] Multi-Z Openspace visual fixes. (#49323)
* openspace fixes

* os over os fix

* 512 plugs

* up

* up up

* up up up

* drop 512

* drop 512 in obj

* drop 512 in turf

* drop 512 in mob p1

* drop 512 in mob p2

* drop 512 in openspace

* one backdrop to rule all
2020-03-02 01:56:37 +08: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
0c15136f11 Merge pull request #49520 from EOBGames/frostysavior
Codename Frosty Saviour- A New Medbay for Metastation
2020-03-01 15:14:23 +01:00
imsxz
558db1e806 adds sloth holding (#49439)
* fixing some kevcode

* kills a runtime

* hold everyone

* adds some sprites

* makes drone and pai up to date with mob holding

* this was meant for the last commit

* hold every pet and put them into a washing machine

* Update monkey.dm

* the cutting edge in pet holding technology

* i hate travis

* i love janitors

* every time i make a commit i tell myself its the last one and then i close out of the tab and dont check back for a few hours
2020-03-01 12:00:19 +01:00
EOBGames
0a0b0a6e72 metamed prime prime
so i forgot something, of course
2020-03-01 02:29:35 +00: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
24803bd33d Merge pull request #48994 from ArcaneMusic/arconomy
[READY]Arconomy: Adds the Vend-A-Tray and the Card Reader stock part
2020-02-29 23:04:31 +01:00
skoglol
ff2f381043 Merge pull request #49612 from Mickyan/pubby_art_gallery
Adds the art gallery to Pubbystation
2020-02-29 22:51:53 +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
skoglol
d0c48cb3fc Merge pull request #49523 from tralezab/bye-bye!
transit tube violence
2020-02-29 22:05:54 +01:00
skoglol
ca1d3adb7a Merge pull request #49477 from Cobraman202/nospaces
Monk's Frock name changed
2020-02-29 21:56:11 +01:00
skoglol
7037fee68f Merge pull request #49607 from AnturK/painting_fixup
Persistent painting fixup
2020-02-29 21:54:25 +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
ArcaneMusic
7902a5731e No long distance relationships. 2020-02-28 17:49:19 -05:00
ShizCalev
9054a4c201 Merge pull request #49596 from ArcaneDefence/Carp_classic_fix
Carp classic carpotoxin fix
2020-02-27 23:36:58 -05:00
Mickyan
ab93a38e9c art gallery 2020-02-28 01:23:29 +01: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
AnturK
555d80ae21 Persistent painting fixup 2020-02-27 20:08:53 +01:00
TWATICUS
8facec32c9 bola time 2020-02-27 09:48:25 -05:00
LemonInTheDark
df9d859da8 Fixes tesla bugs, makes code better (#49260)
* Cleans shit up, adds some upper limits on zap count, makes explosions less commen. Need to fix apc issue before
I test how it plays

* Mood, buffs and nerfs tesla

* Cherry-Picking

* eyyo

* back to basics

* aight

* broooooooooooooooooo

* adds else

* range

* fixes shit

* Sure

* Cleans shit up

* Fixes prob issue

* Gee I like this spooky guy

* I swear to god if prob picks just makes a list I am gonna blow a gasket
2020-02-27 12:06:52 +01:00
ExcessiveUseOfCobblestone
6ec68b1d6e penlite bros 2020-02-26 23:11:28 -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
AnturK
3db29f62ad Removes nonsense from turf destroy (#49574)
Not even going to try to guess what weirdness it caused besides component cleanup.
2020-02-27 12:45:11 +13:00
ArcaneMusic
8bfbe2b201 Alright, should be good to go now. JANNIES? 2020-02-25 17:01:09 -05: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
ArcaneMusic
13e6c0b628 Merge remote-tracking branch 'upstream/master' into arconomy 2020-02-25 13:11:56 -05:00
Mickyan
7495a68808 Adds the art gallery to Deltastation (#49517)
* it's art

* readds photocopier and bookbinder

* trims persistence ids

* let's try this again

* here we go

* fixed a pipe
2020-02-25 18:42:37 +01:00
necromanceranne
24f087c9cf Merge branch 'master' into let-sleeping-carp-lie 2020-02-26 02:55:05 +11:00