Commit Graph

3613 Commits

Author SHA1 Message Date
Fikou
a59e4fb1b5 merges civilian and service departments (#50142)
* merges the service and civilian departments

* yee haw
2020-03-26 22:05:28 +08:00
moo
1a40fbc57d Update votingbox.dm (#50193) 2020-03-25 02:21:00 +08:00
Rob Bailey
2f127f8b95 More glowing stuff (#50109)
* vending machine framework

* wip

* all vending masks

* more glowing stuff

* dynamic unsetting of luminosity

* use define
2020-03-22 23:38:50 -03:00
Rohesie
906d6f3d24 [READY] Fireman carry QoL changes (#49733)
* Fireman carry

* Change requests.

* doc
2020-03-22 18:00:56 -04:00
81Denton
45917da07a Merge pull request #49964 from uomo91/psychologist
Psychologist
2020-03-21 21:37:05 +01:00
EgorDinamit
da3cdd8169 [Ready] Syndicate Forgotten Ship ruin. Balance+Bug fix. (#50120)
* Balance+Bug fix.

* Update forgottenship.dmm

* Update forgottenship.dmm

* Removes rogue table

* Give uranium to plebs.

* Beakers+Few chameleon stuff

* Fluff text rebalance. Allow people to leave the ship as long as it is protected.

* Grammar fix, I guess

* Le grammar

* Replaced interrogation room with medbay. Added tactical medkit(1) to med-vendor and 5 basic medkits to the same vendor. Additional ores, loot.

* Surgery disk update

* O2 canisters to maints area

* GPS signal

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

Co-Authored-By: Rohesie <rohesie@gmail.com>

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-03-21 16:59:22 -03:00
ArcaneMusic
d68ea7748e Improves the feedback on vend-a-trays. (#50061) 2020-03-21 10:18:06 -03:00
wesoda25
95534ff46e =^_^= (#50072) 2020-03-21 09:55:46 -03:00
nemvar
6ce3d4d26f You no longer blugeon railings when unanchoring them. (#50090)
* No bludgeon railings no more

* autodoc
2020-03-21 09:48:50 -03:00
nemvar
6fd8240e17 Fixes critter crates (#50093)
* critter crates no longer disappear

* critter crates actually no longer disappear.
2020-03-21 09:46:45 -03:00
uomo91
c60670547e Creates a psychology locker and adds it to every map. 2020-03-20 09:43:35 -05:00
EgorDinamit
8522ac6779 Merge branch 'master' of git://github.com/tgstation/tgstation 2020-03-20 11:51:56 +04:00
Mickyan
c6b0774b86 [READY]Adds the Smooth-Headed (super bald) quirk (#49932)
* super baldness

* cleanup

* fix

* stuff

* woops

* and done

* docs, changed proc names

Co-authored-by: Unknown <Floydje123@hotmail.com>
2020-03-20 00:15:10 -07:00
EgorDinamit
99db5b0a76 Update code/game/objects/structures/ghost_role_spawners.dm
Co-Authored-By: Rohesie <rohesie@gmail.com>
2020-03-20 10:21:20 +04:00
Rohesie
d74c0bfba1 Merge pull request #50012 from kingofkosmos/time_tenses_to_present
Verb time tenses to present tense
2020-03-19 16:19:49 -03:00
uomo91
1d7b95511c Merge branch 'master' into psychologist 2020-03-19 05:33:15 -05:00
EgorDinamit
029b10a06d Merge branch 'master' of git://github.com/tgstation/tgstation 2020-03-18 19:04:21 +04:00
kingofkosmos
b8c35332f5 repaired --> repairs 2020-03-16 15:04:26 +02:00
kingofkosmos
79c5a80ca0 Visible_messages verb time tenses changed to present. 2020-03-16 14:55:25 +02:00
Time-Green
c04abab2bf [READY] Makes plumbing mappable and reworks hiding (#49644)
🆑
tweak: Ducts can now be hidden under tiles
code: tile hiding is now an element and way cooler and sexier
/🆑

Ducts can now be hidden under tiles
Plumbing machinery connects can now be hidden aswell
Plumbing can now also be properly mapped in without breaking anything
Plumbing component now uses the normal overlay systeem instead of being a weird exception

You can now add the /datum/element/undertile element to instantly make something hidable under tiles when appropriate.
2020-03-16 20:37:59 +13:00
uomo
f40f99dc64 Basic job code, access, spawn point landmark, area, department sign. 2020-03-13 23:27:23 -05:00
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
EgorDinamit
7e8115e878 Merge branch 'master' into master 2020-03-08 15:08:50 +04: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
EgorDinamit
0c0eb90c2a Merge branch 'master' of git://github.com/tgstation/tgstation 2020-02-27 22:40:42 +04: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