Commit Graph

30614 Commits

Author SHA1 Message Date
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 5c2b8fc0d5 Advanced tool exports. (#49498) 2020-03-05 20:03:16 +08:00
spookydonut 3c2e217ccc Secway and janicart key suicides (#49681)
* Update vehicle_key.dm

Adds a unique suicide to the secway key where the user spins, and gibs after a short delay.

* Improvements

Fixes a runtime, adds a little silliness.

* Adds shame result

Grammar changes and "rewards" anyone that successfully fails to commit suicide.

* Adds janicart key suicide

Adds a skillcheck to the suicide that will have varying effects based on the level the user has.

* Adds the return at the end of the file back

Whoops, didn't notice I deleted that I guess. Dunno if that matters, but I have no reason to remove it, so I'm putting it back.
2020-03-05 19:46:56 +08:00
spookydonut e121d35850 Adds the ability for borgs to wear drones and pAIs as hats. (#49684)
* hat

* autodoc on Exited()

dunno if I need to, but it's like four lines.

* no more broken pAIs pls
2020-03-05 19:45:40 +08:00
spookydonut 9d198c8cc1 Fixes some leftover revhead flash bugs (#49706) 2020-03-05 19:36:49 +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
Jordan Brown 024d4d8581 Makes bloodcrawling a trait instead of a var (#49572) 2020-03-05 01:57:58 -05: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
ShizCalev bd8122b9c0 Merge pull request #49704 from ArcaneDefence/Secbelt-vest_exploit_fix
Headrev antag check exploit fix
2020-03-04 04:01:30 -05:00
Fikou e2ad1e4e3e private security officers get a nanotrasen id icon (#49481) 2020-03-04 19:58:28 +13:00
LemonInTheDark 0fb4bb0f95 Fixes wizard exploit (#49632) 2020-03-04 14:32:55 +08:00
ArcaneDefence 5468ce388d Update revolution.dm 2020-03-03 23:29:39 -07: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
ArcaneMusic ad62bf157f Prevents evidence bags holding more bags. (#49243)
This disallows evidence bags from holding any subtypes of obj/item/storage, so that evidence bags can't hold other storage items, that hold evidence bags holding storage items that hold evidence bags holding storage items etc.

Ideally, they should probably be a storage subtype themselves, but this will keep them from holding effectively infinite storage.
2020-03-04 11:20:43 +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
Emmett Gaines 1c21534422 Adds a unit test to make sure the id_arg_index is used (#49676) 2020-03-04 00:47:48 +08:00
Dennok 31c7c9d0cb fix BSA deploy (#49642) 2020-03-03 18:06:59 +08:00
Ryll Ryll 001cc78141 fixes issues (#49663) 2020-03-03 18:03:48 +08:00
nightred 6544145fc1 Vendor fix when they are hacked and have no contraband items (#49626)
* vendor fix when hacked and no contraban

* Captain Pirate Hat Name, 0 on off station vendors

* contraband items pricing fix

* Fixed up

* Rebuild Tgui
2020-03-03 10:06:46 +02:00
skoglol 396518ccaa Merge pull request #49661 from necromanceranne/oh_god_i_made_demigods_helpies
Sleeping Carp Knee Jerk Nerf: Nyoops Edition
2020-03-03 02:10:23 +01: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
Arkatos1 f515a72638 Converts all remaining Malfunction verbs to action buttons (#49625)
* Base version, no custom icons

* Custom icons

* Cleanup
2020-03-02 21:36:21 +08:00
spessbandit eb20ff8638 Killing a morph resets its desc. (#49617) 2020-03-02 21:34:48 +08:00
PKPenguin321 cb09d42585 go up/down message change (#49472)
"There's nothing in that direction!" -> "There's nowhere to go in that direction!"
because there IS something in that direction, you just can't go through the ceiling/floor.
2020-03-02 21:23:20 +13:00
necromanceranne bf2ab26d2e I think the fishmen are no longer pillermen 2020-03-02 13:47:47 +11:00
Arkatos1 aef68ff87a tgui: Remote Robot Control (#49622)
This PR converts AI's Remote Robot Control from html based interface to tgui with some tweaks and improvements.
2020-03-02 09:30:59 +13:00
81Denton 9deffbd87c Merge pull request #49601 from optimumtact/discordisliterallyafuck
Improves discord roleapi system
2020-03-01 21:29:13 +01: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 24de591c87 Merge pull request #49636 from Ryll-Ryll/let-there-be-tape
Puts basic sticky tape in autolathe, makes pointy and super sticky tape the BEPIS major reward
2020-03-01 15:22:35 +01:00
skoglol d519dda70f Merge pull request #49638 from XDTM/zombieMeta
Properly fixes zombie powder permastun
2020-03-01 15:20:27 +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
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 4f54159718 Merge pull request #49545 from ATH1909/itsspelledwithanhdamnit
Cleans up some of the code for unhusking people with chems, also reduces the amount of synthflesh required to unhusk someone
2020-02-29 23:23:06 +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 da91647a5e Merge pull request #49594 from nightred/feverheads
Fever and fire cause body temp changes properly
2020-02-29 22:56:05 +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 586e8ec8ed Merge pull request #49620 from Ryll-Ryll/squish-2-squish-harder
Vendors squish more
2020-02-29 22:48:40 +01:00
skoglol 4dcf63c24f Merge pull request #49619 from AnturK/spacevinefix
Fixes spacevine event.
2020-02-29 22:45:29 +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 f6ec8ddf4a Merge pull request #49604 from Arkatos1/ParticleUI
tgui: Particle Accelerator
2020-02-29 21:51:24 +01:00
skoglol a0761f2952 Merge pull request #49597 from LemonInTheDark/atomize-they-said
Atomizes my sm fixes from #48935
2020-02-29 21:34:07 +01:00
pireamaineach 329ae9aa3f [READY] Fixes a glaring issue with envirogloves. Speedmerge?? haha jk... unless...? (#49584)
[READY] Fixes a glaring issue with envirogloves. Speedmerge?? haha jk... unless...?
2020-02-29 04:57:06 -08:00
XDTM 69fbfcf9b3 Properly fixes zombie powder 2020-02-29 12:38:43 +01:00
ATH1909 8ed78fca5d kriskog this was exactly what this PR was supposed to fix ahhhhhh 2020-02-29 05:36:32 -06:00
Arkatos cdd8ebe8d2 Conflict resolution 2020-02-29 12:20:03 +01:00
Ryll-Ryll e21e317a0f more tape 2020-02-29 06:09:31 -05:00
LemonInTheDark 2e0a2257eb Makes the tesla gun more METAL (#49470)
* Adds fun

* Makes it hurt

* Makes mechs hit harder

* Removes stun
2020-02-29 17:28:42 +11:00