Commit Graph

30587 Commits

Author SHA1 Message Date
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
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
LemonInTheDark
d80d259ba1 ya ever just.... 2020-02-28 22:13:49 -08:00
LemonInTheDark
95f2c5c156 Cleans some stuff I lost in the transfer 2020-02-28 16:08:34 -08:00
Ryll Ryll
ca0701fe65 Update _vending.dm 2020-02-28 08:55:19 -05:00
AnturK
2cf5adc6e7 Fixes spacevine event. 2020-02-28 14:41:23 +01:00
81Denton
f78a7f6230 Merge pull request #49555 from Farquaar/Farquaar-meowpatch
Adds say_mod variable to felinids
2020-02-28 13:53:15 +01:00
Farquaar
e8f0794d6c Felinids "meow" 2020-02-28 07:37:18 -05:00
ShizCalev
3eabac3da8 Merge pull request #49606 from Twaticus/bola
Inhand sprites for bolas
2020-02-27 23:35:25 -05:00
Farquaar
2675496ce7 Felinids "blither" 2020-02-27 22:10:28 -05:00
nightred
70a3925567 fever and shivers change body temp normal 2020-02-27 20:22:05 -06:00
Mickyan
ab93a38e9c art gallery 2020-02-28 01:23:29 +01:00
spookydonut
1a1533a2e3 Code docs some mob stuff (#49570)
* update damage proc codedocs

* docs for mobs

* change requests
2020-02-28 11:14:39 +13:00
TheVekter
c0c21389e3 Autodoc for XB and Research defines (#49575)
* Adds some auto documentation for Xenobiology

* Fixes spacing
2020-02-28 11:14:18 +13:00
TWATICUS
8facec32c9 bola time 2020-02-27 09:48:25 -05:00
Arkatos
929a54e47d Conflict resolution 2020-02-27 13:15:17 +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
ShizCalev
ddcb56404c Merge pull request #49585 from Ryll-Ryll/cmdr-beepsky
Promotes Beepsky
2020-02-27 04:45:32 -05:00
Arkatos1
59379b371f tgui: Malfunction Module Picker (#49532)
* Module Picker UI

* Bugfixes, tweaks, malf theme

* Malfunction theme removed, generalized Uplink interface and tweaks

* Revert "Malfunction theme removed, generalized Uplink interface and tweaks"

This reverts commit e30dd183567325dd7a339ec3eb9d237a98b5fe3e.

* Rename and cleanup

* Cleanup
2020-02-27 01:19:26 -08:00
oranges
eea13a21ea Improves discord roleapi system
Sends the discord id to the patch call, not the ckey

Add the verify command to readd the role to the api, with
a hacky, but effective slowdown to prevent the API being flooded easily
2020-02-27 06:47:16 +00:00
LemonInTheDark
0725fb05b0 Merge branch 'master' into atomize-they-said 2020-02-26 19:26:41 -08:00
LemonInTheDark
51a241ffc8 There's the rest 2020-02-26 18:10:35 -08:00
LemonInTheDark
93745c7097 Mood 2020-02-26 17:34:30 -08:00
LemonInTheDark
7d1b96fb6c Wew god (#49593) 2020-02-26 16:58:56 -05:00
ATH1909
d457b2ecb1 Update code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
Co-Authored-By: skoglol <33292112+kriskog@users.noreply.github.com>
2020-02-26 13:55:51 -06:00
AnturK
a2ff959950 Batch of runtime fixes. (#49568)
* Fixes secret sauce recipe paper.

* Fixes say runtime

* Fixes modular computer on holodeck runtime

* Fixes bee runtime

* Fixes grav holopara runtime

* Fixes olfaction runtime

* Fixes zombie runtime.

* Cleanup
2020-02-26 20:47:31 +08:00
Ryll-Ryll
fba8f793c2 promotes beepsky 2020-02-25 21:02:57 -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