Commit Graph

3577 Commits

Author SHA1 Message Date
wesoda25
a34e81d426 Adds a couple mood events (#49918)
* bang!

* Dr. Joseph-Ignace *********
2020-03-14 01:58:18 +01:00
skoglol
b94cf14b8a Merge pull request #49235 from Bawhoppen/prisoners
Redesigns and Expands Permabrig
2020-03-13 05:08:24 +01:00
Dennok
51f245fa1e ladder radial red arrow (#49872) 2020-03-12 15:32:33 -04:00
Bawhoppen
7f73fd2a7b Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners
# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
2020-03-12 05:06:09 -05:00
Dennok
b4ada86f1f Ladder radial menu. (#49800)
* ladder radial menu

* arrows
2020-03-10 16:38:57 +08:00
Timberpoes
a74cf4789f Fix chair examine edge case (#49827)
* Fix chair examine edge case

* Modernising chair code

* Dynamically generate examine text from source object

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

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-03-10 14:08:41 +08:00
spookydonut
beca456c0f Add new lints (#49751)
Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-03-09 22:13:48 -07:00
Ryll Ryll
f9963454db Adds tackling (VIDEO INSIDE) (#49476)
* huthtuthuthuthtuhtuthuthuthuthtuthuthuthtuthut

* documents and expands, adds new glove types

* Adds slamming into tables and neatens up throwingdatum handling (+stuff)

* bit less squishy

* adds sprites, offbrands, swaps most combat insuls for tacklers

* adds dolphin and rocket gloves to BEPIS

* changes dna to traits, buffs tackling

* same as last commit but moreso

* updates docs, nerfs stuns

* vending machines, better docs

* window tackles for good measure

* gets window splats working

* polish off

* LAST DAY OF SCHOOL
2020-03-06 11:17:52 +08:00
Bawhoppen
7bb27cf55e getting closer to being ready 2020-03-05 18:09:21 -06:00
Emmett Gaines
d0870a95ac Makes Crossed and Moved should call parent (#49671) 2020-03-05 10:25:24 -05:00
spookydonut
a003e376ef Brooms Upgraded: Disposal Bin Edition (#49433)
* clean sensation

* speedmerge hack

* mso.webm

* Update code/game/objects/items/twohanded.dm

Co-Authored-By: nemvar <47324920+nemvar@users.noreply.github.com>

Co-authored-by: nemvar <47324920+nemvar@users.noreply.github.com>
Co-authored-by: spookydonut <github@spooksoftware.com>
2020-03-05 20:57:20 +08:00
Bawhoppen
1f82ec544e Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners 2020-03-04 20:02:26 -06: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
Bawhoppen
d0c5d63116 Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners 2020-03-02 19:30:48 -06: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
Bawhoppen
527ab502a3 Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners
# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
2020-03-01 03:30:17 -06: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
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
ArcaneMusic
7902a5731e No long distance relationships. 2020-02-28 17:49:19 -05:00
Bawhoppen
fd5f209863 Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners 2020-02-27 17:12:47 -06:00
AnturK
555d80ae21 Persistent painting fixup 2020-02-27 20:08:53 +01: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
ArcaneMusic
8bfbe2b201 Alright, should be good to go now. JANNIES? 2020-02-25 17:01:09 -05: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
tralezab
3d08c2d3e7 Merge branch 'bye-bye!' of https://github.com/tralezab/tgstation into bye-bye! 2020-02-23 11:19:38 -08: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
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
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
Cobraman202
586621e786 Changed "Monk's Frock" to the more modern term of "Monk's Habit" 2020-02-21 00:12:38 -06: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
Qustinnus
72fb1458a7 Adds the shower bot, makes sure you don't become too bloody (#49083)
* Epicgamers

* woops

* Update code/modules/mob/living/simple_animal/bot/construction.dm

Co-Authored-By: TheChosenEvilOne <34602646+TheChosenEvilOne@users.noreply.github.com>

* slip

* fix

* epic

* emag functionality

* Update code/modules/mob/living/simple_animal/bot/hygienebot.dm

* Update code/modules/mob/living/simple_animal/bot/hygienebot.dm

* step 1

* woops

* fixes

* fixes

* fixes++

* fixes a broken thing

* lol ok

* fixes

* oopsie

* oneliner

* lmao webedits

* small brain

Co-authored-by: TheChosenEvilOne <34602646+TheChosenEvilOne@users.noreply.github.com>
2020-02-20 22:31:22 +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
ArcaneMusic
ea475c528f Merge remote-tracking branch 'upstream/master' into arconomy 2020-02-20 02:51:18 -05: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
f46301c1ef Merge pull request #49391 from cacogen/rcdairlockassemblies
RCD can now deconstruct airlock assemblies and firelock frames
2020-02-18 22:41:54 -05:00
Bawhoppen
e9864e1d88 fix1 2020-02-18 04:47:10 -06:00
ShizCalev
7209ac3c93 Removes unnessacary math defines 2020-02-17 23:09:09 -05:00
JJRcop
a1392847bd Remove ismovableatom macro (#9) 2020-02-17 15:03:16 +01:00
cacogen
458b783d3c Change airlock assembly deletion cost to 16
Add the ability to delete firelock frames
2020-02-18 02:54:16 +13:00
cacogen
fa685bb4be RCD can now deconstruct airlock assemblies
Get through the pile of work left by explosions slightly quicker.
2020-02-18 02:54:16 +13:00
MMMiracles
ee70efac67 Makes railings good (#49171)
About The Pull Request

Makes rails functional in that they can be vaulted from either side, moved, and repaired. Still doesn't add a way to make them.
Why It's Good For The Game

make multiz great

Waiting/working on a few things for the map so I'm just atomizing the few things I'm sitting on so other map makers can take advantage of in the meantime.
2020-02-17 21:41:52 +13:00
Mickyan
a6ff3cc65c Adds the broom (#49120)
It's a broom

The basic janitorial tool that's been missing for all these years

Demo here: https://www.youtube.com/watch?v=KHcEIhAxx0g

🆑
add: Added the broom. For sweeping.
/🆑
2020-02-17 21:39:08 +13:00