Commit Graph

30887 Commits

Author SHA1 Message Date
RiskySikh
9d111bc4df Adds Lean Recipe (#50029)
Lean

* morphinedosagefix

* tastefix

* comment

* Update code/modules/reagents/chemistry/reagents/drink_reagents.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>
2020-03-20 17:06:05 -03:00
RiskySikh
56979cb0c5 Adds Cannoli (#49985)
* GoatPlushie

Removes emagged plushie

* Revert "GoatPlushie"

This reverts commit f4395c4afdeb55c959cd1716eadc37ef2ff0c809.

* Cannoli
2020-03-20 13:00:37 -03:00
Rohesie
91477076ac Merge pull request #50060 from mrhugo13/sonicandknuckles
Adds emote to crack your knuckles.
2020-03-20 10:11:28 -03:00
Unknown
e7a60f3d4b roh said these were not needed 2020-03-20 13:59:35 +01:00
Unknown
a5a3a42119 asdf1 2020-03-20 13:48:09 +01:00
Unknown
7fdfa52ceb god damnit this game is driving me mad 2020-03-20 13:37:32 +01:00
Rohesie
63d1327c5f Merge pull request #49349 from EgorDinamit/master
[READY]Adds new Space Ruin with ghost roles.
2020-03-20 05:24:56 -03:00
Bobbahbrown
fdcbc8cd83 Adds Configurable Living Time Requirement to Discord Auto Enrollment (#50052)
About The Pull Request

As requested by oranges this enforces a requirement, when configured, that a player must have a certain amount of living playtime in hours to auto-enroll into a discord role.
Why It's Good For The Game

Removes discord moderation requirement
Changelog

cl bobbahbrown
server: Discord role auto enrollment can now be configured to require a certain number of living hours.
/cl
2020-03-20 21:09:16 +13:00
EgorDinamit
4d7140f09e Merge branch 'master' of https://github.com/EgorDinamit/tgstation-1 2020-03-20 11:58:03 +04:00
ArcaneDefence
4dd4d0e6f6 Abductor console exploit fix (#50050)
* Cooldown vars

* Changes how the cooldown is determined

* Further change as requested

* Continued changes
2020-03-20 00:52:07 -07:00
EgorDinamit
8522ac6779 Merge branch 'master' of git://github.com/tgstation/tgstation 2020-03-20 11:51:56 +04:00
ArcaneMusic
0e7eb95e06 Extinguished burning clothes no longer burn forever. (#50062)
* Smouldering clothes can now manually be extinguished.

* Extra safety on mob overlays.

* moves overlay cutting to carbon.dm

* Check check.
2020-03-20 00:45:23 -07:00
ArcaneMusic
97f42eeade Modular computers, in particular tablets, now have export valu… (#49952)
* Modular Computer Part Exports

* Couple value tweaks.
2020-03-20 00:40:46 -07:00
Fikou
1fbc560bc9 knight armour now has an unique list of allowed stuff (#49975) 2020-03-20 00:35:40 -07:00
Fikou
056cefcca5 wizard's backpack box is now an internals box (#49970) 2020-03-20 00:26:25 -07:00
Arkatos1
de4b485dd4 Assemblies, TTV and Electropack now require you to hold them i… (#49987)
* Electropack status fix

* Hands check

* Cleanup

* TTV and assemblies hands state
2020-03-20 00:25:41 -07:00
Iamgoofball
de65153f3d Corrects the price on the South Bronx Paradise bars. (#49963)
Eight dollars a bar, fry-man. So, uh, you look.
2020-03-20 00:24:44 -07:00
Sylphet
3ca324214a Adds poutine (#50010)
* adds code and sprite for poutine

* added gravy reagent and updated poutine recipe to use it in place of ketchup

* fixed errors causing failed check

* fixed errors causing failed check

* fixed another failed check

* custom poutine can now be made

Co-authored-by: Sylphet <Sylphet@users.noreply.github.com>
2020-03-20 00:23:47 -07:00
EgorDinamit
26607236ce Update code/modules/ruins/spaceruin_code/forgottenship.dm
Co-Authored-By: Rohesie <rohesie@gmail.com>
2020-03-20 11:21:32 +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
Arkatos1
9bf056f7ac New spell type - Pointed spells (#49909)
* Initial commit

* Ranged Blind override version

* Pointed spells category, repath, blind icons and blind pointed spell

* Icon resize, cleanup

* Trigger bugfix

* Code cleanup

* Cast cleanup

* Refactor, easier inheritance, specific intercept checks
2020-03-20 00:12:31 -07:00
Whoneedspacee
7a0840fe00 Fixes Singularity Weirdness (#49931)
* objects moved into are now consumed

if the singularity bumps into an object it continues moving in the same direction

* no longer infinitely runs into not destroyed objects
2020-03-20 00:11:46 -07:00
EgorDinamit
b7d4ea415e Update code/modules/ruins/spaceruin_code/forgottenship.dm
Co-Authored-By: Rohesie <rohesie@gmail.com>
2020-03-20 10:20:34 +04:00
EgorDinamit
a03464b9a2 Update code/modules/ruins/spaceruin_code/forgottenship.dm
Co-Authored-By: Rohesie <rohesie@gmail.com>
2020-03-20 10:20:06 +04:00
EgorDinamit
cf6a056519 Update code/modules/mob/living/simple_animal/hostile/nanotrasen.dm
Co-Authored-By: Rohesie <rohesie@gmail.com>
2020-03-20 10:17:43 +04:00
EgorDinamit
2e4bba44bd Update code/modules/mob/living/simple_animal/hostile/nanotrasen.dm
Co-Authored-By: Rohesie <rohesie@gmail.com>
2020-03-20 10:16:57 +04:00
Rohesie
9d4eb582ac Merge pull request #49563 from Fikou/clarke
[READY] Adds Clarke, your new mech buddy!
2020-03-19 18:29:49 -03:00
IndieanaJones
422ef20ba8 [READY] Space Dragon Rework (#49344)
* Remove Space Dragon from drake.dm

* Add space_dragon.dm

* Update spacedragon.dmi

* Add actions_space_dragon.dmi

* Add carp_rift.dmi

* Load space_dragon.dm

* Update space_dragon.dm antagonist file

* Update spawn_dragon.dm Spawn Event

* Update misc.dm for Space Dragon Win Definition

* Update role_preferences.dm to include Space Dragon

* Update ticker.dm to include Space Dragon news message

* First Trailing Newline for Travis

* Second Trailing Newline for Travis

* Changing rift to rifts

* Update antag file with proposed new weight and time

* Update the Greeting to be Correct

* Update space_dragon.dm mob file

* Remove Space Dragon Win Definition

* Remove Space Dragon News Message

* Undo Whitespace change

* Update space_dragon.dm

* Travis got mad about how I spelled CENTCOM in Autodoc Info

* Update code/modules/events/space_dragon.dm

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

* Update space_dragon.dm

* Update space_dragon.dm

* Display Space Dragon in his own section of the Antag Panel

* Use the new Spacewalk trait

* Add Speed Boost After Rift Charge, Passive Healing While On Rift

* Adds Space Dragon to the Dynamic Midround System

* Notify Ghosts When a Carp Spawn is Added

* Actually Fix That

* Reduces Space Dragon's Spawn Weight from 10 to 5

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-03-19 22:01:52 +01:00
Rohesie
66b078d713 Merge pull request #49808 from ATH1909/finally
[READY] Cyborgs can finally unbuckle people from chairs
2020-03-19 17:47:55 -03:00
AnturK
d02e0cc364 Gateway refactor (#49868)
* Gateway refactor core stuff

* Updates gateways on aways.

* Boxstation gateway & control

* Deltastation gateway & control.

* Kilo gateway & control

* Meta gateway & control.

* Pubby gateway & control.

* makes away gateways easier to use.

* Makes gateway names bit better.

* No need for two dmis

* Autolinkup & description

* Docs formatting.

* Donutstation gateway & control

* Icon and init fixups

* ui fixups

* Better var name

* Use roundstart time instead of server time.

* sets dir properly, and locks bumper to south entry only.

* Cleans up gateway sprite a bit ?

* tgui build
2020-03-19 22:31:01 +02: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
Rohesie
4b4b3ba70e Merge pull request #50049 from Fikou/patch-132
removes a space in ert prompt
2020-03-19 16:17:17 -03:00
Rohesie
3b14271655 Merge pull request #50038 from Time-Green/fixes-plumbin-visual-bug
Fixes being able to spin anchored plumbing machinery
2020-03-19 15:53:12 -03:00
nemvar
556e48b431 Heads can no longer grants all access. 2020-03-19 14:18:23 +01:00
Unknown
37c3571665 naisu 2020-03-19 13:50:47 +01:00
Rohesie
39e5bd6c73 Merge pull request #48747 from kevinz000/movespeed_modifiers_take_two
Movespeed modifiers, take two
2020-03-18 17:29:49 -03:00
EgorDinamit
029b10a06d Merge branch 'master' of git://github.com/tgstation/tgstation 2020-03-18 19:04:21 +04:00
Unknown
6496b725e7 douke 2020-03-18 13:12:23 +01:00
ShizCalev
7346366d68 Merge pull request #50011 from Fikou/patch-127
mutagen now doesnt work on rad immune species
2020-03-18 01:23:59 -04:00
ShizCalev
75a4233ee8 Merge pull request #50041 from RiskySikh/RiskySikhSixthPR
Fixes metabolization not being called on sudden death
2020-03-18 01:20:57 -04:00
Fikou
b9842304ee oops 2020-03-18 03:41:04 +01:00
ShizCalev
f03862e934 Merge pull request #50000 from JJRcop/drone-fixes
Drone fixes
2020-03-17 22:36:39 -04:00
ShizCalev
7eac42255c Merge pull request #49997 from kriskog/beakeeeers
Fixes drinks dispenser beaker icons
2020-03-17 22:31:25 -04:00
ShizCalev
3dffa0b6e5 Merge pull request #49983 from Arkatos1/ShellTweaks
AI Shell naming consistency
2020-03-17 22:29:15 -04:00
ShizCalev
951f6f792f Merge pull request #49948 from Dennok/chronosuit-fix
chronosuit cam fix
2020-03-17 22:28:40 -04:00
ShizCalev
22efcf0432 Merge pull request #50022 from Fikou/patch-128
liquid gibs now give meat material to metalgen
2020-03-17 22:01:33 -04:00
ATH1909
58c867d218 Some grabbing tweaks (#49544)
* Update living_defense.dm

* Update living.dm

* Update code/modules/mob/living/living.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* Update living.dm

Co-authored-by: spookydonut <github@spooksoftware.com>
2020-03-17 19:56:38 -04:00
Fikou
df8b8f5d9b removes improper grammar in ert prompt 2020-03-18 00:54:57 +01:00
Rohesie
5b29fe7a60 Fixes two gun cell runtimes (#50039)
They were erroring when doing a cell_type new()
2020-03-18 12:53:09 +13:00
Rohesie
0209e5005f Merge pull request #50006 from Dennok/patch-15
fix for blood drips layering in openspace
2020-03-17 19:07:22 -03:00