Commit Graph

12984 Commits

Author SHA1 Message Date
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
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
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
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
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
ArcaneDefence
edf74e5c05 Update cigs_lighters.dm
Fix for https://github.com/tgstation/tgstation/issues/49588
2020-02-26 17:45:16 -07: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
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
EOBGames
584cf73c09 metamed1.3
a good round of feedback, guys
2020-02-25 03:57:44 +00: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
spookydonut
6f74b6a51b Merge pull request #49510 from Arkatos1/ElectropackUI
tgui: Electropack
2020-02-24 15:36:24 +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
tralezab
3d08c2d3e7 Merge branch 'bye-bye!' of https://github.com/tralezab/tgstation into bye-bye! 2020-02-23 11:19:38 -08:00
Ryll-Ryll
33d2628c34 spacing and correcting comments 2020-02-23 07:03:01 -05: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
tralezab
b9ad061e60 Update transit_tube_pod.dm 2020-02-23 01:46:29 -08:00
tralezab
02bb6dc723 Update transit_tube_pod.dm 2020-02-23 01:32:15 -08:00
tralezab
0027b55583 violence 2020-02-23 01:28:43 -08:00
TheVekter
bc44988ba2 [READY] R&D Rework: Splits anomaly cores into separate versions, modifies build paths (#49448)
* Splits anomaly cores into separate versions

* Converts the wormhole projector to require a bluespace core.

* Cleaned up a few lines

* Fixed small bug issues

* The gravity gun now requires a grav core. Increased weight of some anomalies.

* Enables high-intensity grav anomaly

* Fixing minor issues
2020-02-22 20:40:40 +01: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
AnturK
745fec6cc5 Paintings icons and persistence. (#49233)
Restores canvases showing up their content on the map.
This only gets updated on finalizing/naming the painting.
Adds persistent paintings, set persistence_id on sign/painting on your map to use it.

Bumps rustg up to 4.3
2020-02-23 00:22:53 +13:00