Commit Graph

11903 Commits

Author SHA1 Message Date
Ryll Ryll
bf177cffed Shoelace fixes, adds helper for seeing if you're already interacting with a target (#50048)
* use the correct do_after target

* stomp

* sorry travis

* lace em up

* less specific

* checks if the shoes move

* NULL ME OUT

* last requests

* unhelper
2020-03-30 23:53:16 -03:00
Akrilla
078d7bebc4 stam crit (#50297) 2020-03-30 17:29:55 -03:00
Arkatos1
c7c2e4b531 Mouse pointer icons cleanup (#50241)
About The Pull Request

This PR reorganizes all mouse pointers icons in the codebase into a single folder under /effects, and removes 4 unused mouse pointer icons, all of which are remnants of the Clockwork Cult.

Also removes one rogue white pixel in blind_target.dmi.
Why It's Good For The Game

Better organization and less space taken by unused icons.
Changelog

cl Arkatos
code: Mouse pointer icons were reorganized to be more easily used in the future.
/cl
2020-03-30 10:00:39 +13:00
Rohesie
96810ba7c0 incapacitating traits (#50270) 2020-03-29 16:12:08 +08:00
Gamer025
b9b188a830 Fixes "Show alerts" button/link in chat doing nothing for borgs (#50195)
* Fix "Show alerts" button/link in chat

AI has a topic proc that checks if showalerts is 1 (gets set by clicking the href) and if yes shows AI alerts. works the same for borgs but they don't have a custom topic proc so showalerts is never evaluated

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

Today I learned that . = ..() is better than ..() thanks to the coding people from the discord server

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

Co-authored-by: spookydonut <github@spooksoftware.com>
2020-03-28 21:08:15 +08:00
moo
a93bc92034 fixes nightmare (#50174)
meow :3
2020-03-25 14:06:52 -03:00
trollbreeder
af1777d7de Adds some documentation to species.dm (#50121)
* Documentation on species vars, and roughly 40-50% of procs

I can do no more of this. My mind is dead from boredom.

* thought this proc was deprecated, apparantly its not

cloning removal has permanentally scarred me

* Updates speed and armor variable docs

It wasn't made clear that armor was percentage based and speed was multiplicative in the documentation. This is now fixed.
Also removes some whitespace.

* Update code/modules/mob/living/carbon/human/species.dm

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

* Update code/modules/mob/living/carbon/human/species.dm

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

* Update code/modules/mob/living/carbon/human/species.dm

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

* Documentation updates with Qustinuss

Mentions fixedmutcolor in hair_color
Makes preferred food_type vars more clear that they are bitfields.
toxic_food is not toxic, it's just more disgusting than disliked food
Updates overlay var doc to mention that an empty string adds no damage overlays.

* Defines uniqueness, also lastname docs change

Updates generate name proc to have info on the unique argument
Changes override this to set to false on lastname. Overriding is done with procs, not vars or arguments

* updates proc docs to use double asterisk

if this fails travis documentation i'm gonna be angery

* i guess that makes sense

updates copy properties proc with better docs

* Part 2 of i guess this makes sense

i should stop early commiting y'know

* Update code/modules/mob/living/carbon/human/species.dm

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

Co-authored-by: nemvar <47324920+nemvar@users.noreply.github.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
2020-03-23 08:27:36 -03:00
Rohesie
528fc99f28 lying to lying_angle and set proc (#50018)
* lying angle

* duplicate

* Documentation

* Comments
2020-03-22 21:49:52 -07:00
Rohesie
906d6f3d24 [READY] Fireman carry QoL changes (#49733)
* Fireman carry

* Change requests.

* doc
2020-03-22 18:00:56 -04:00
Mickyan
aee54c56c5 Adds space carp taming and a new bundle for the curator: the carp hunter (#50020)
* fish friends

* fish pals

* fish pals

* dumb

* hunting knife now is useful

* hunting knife now has a sprite

* FUCK

* inhand

* rohesie reviews

Co-authored-by: Fikou <piotrbryla@onet.pl>
2020-03-21 21:11:11 -03:00
IndieanaJones
e99b50a7d5 [READY] Reworks the Venus Human Trap (#49736)
* Update venus_human_trap.dm

* Update venus_human_trap.dm

* Update spacevine.dm

* Update venus_human_trap.dm

* Update language_holder.dm

* Update venus_human_trap.dm

* Update spacevine.dm

* Update code/modules/events/spacevine.dm

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

* Update code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

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

* Update code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

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

* Update code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

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

* Update code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

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

* Appease the Great Circular One

* Update code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

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

* Update code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

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

* Update code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

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

* Update code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

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

* Update venus_human_trap.dm

* Fix Spacing

* Update code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

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

Co-authored-by: spookydonut <github@spooksoftware.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
2020-03-21 20:51:50 -03:00
XDTM
0e397ae7fb Adds a customizable "seed" to posibrains to tell ghosts what the posibrain will be used for (#49813)
* Adds a customizable "seed" to posibrains to tell ghosts what the posibrain will be used for

* Update posibrain.dm

* reduce max length and input feedback
2020-03-21 12:57:28 -04:00
wesoda25
8f62bf5405 Ethereals can no longer spam drain power sources//minor powersource drain time tweaks (#50084)
* finally!

* forgot this
2020-03-21 17:15:42 +01:00
Arkatos1
8538bc36e7 Removal of slime and elite huds (#50096) 2020-03-21 17:13:23 +01:00
Rohesie
0cf8f7cd9d Dynamic current_players lists rework (#50013)
* current player lists

* Docs
2020-03-21 17:05:13 +01:00
Rohesie
e36475e1f4 Slowdown fixes and tweaks (#50095)
* Slowdowns

* Highlander fix
2020-03-21 17:01:34 +01:00
Qustinnus
26b40f5478 fixies (#50068) 2020-03-21 10:00:28 -03:00
Ghilker
e7a22853f7 Addition of Freon (no removal, no fire) (#49821)
* Just freon addition, no removal nor fire. Maybe unbalanced

* fixes

* material properties addition, removed from the object itself

* added admin and game logging to hot ice

* Typos

* made the component more generic

* other typos, some fixes

* typos and balancing

* better code readability

* dunno

* merge error and travis build errors fixes

* asked changes, fixes and balancing
2020-03-20 19:08:50 -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
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
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
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
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
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
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
75a4233ee8 Merge pull request #50041 from RiskySikh/RiskySikhSixthPR
Fixes metabolization not being called on sudden death
2020-03-18 01:20:57 -04:00
ShizCalev
f03862e934 Merge pull request #50000 from JJRcop/drone-fixes
Drone fixes
2020-03-17 22:36:39 -04:00
ShizCalev
3dffa0b6e5 Merge pull request #49983 from Arkatos1/ShellTweaks
AI Shell naming consistency
2020-03-17 22:29:15 -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
Rohesie
a6fc7f86d9 Merge pull request #50019 from TiviPlus/trenchcoat
Fixes the ablative hood
2020-03-17 18:27:43 -03:00
Tim
c8bae274e3 Le docs 2020-03-17 21:58:53 +01:00
Bindy Johal
9a5f029abd SuddenDeathMetabolizationFix 2020-03-17 13:05:30 -06:00
kevinz000
a89cc9b913 k 2020-03-17 09:49:05 -07:00
kevinz000
d5cd073887 Merge remote-tracking branch 'tgstation/master' into movespeed_modifiers_take_two 2020-03-17 09:48:02 -07:00
kevinz000
1b985a5d88 oh shit u right 2020-03-17 09:47:27 -07:00
kevinz000
ad46b3bcef Update code/modules/mob/living/living_movement.dm
Co-Authored-By: Rohesie <rohesie@gmail.com>
2020-03-17 09:44:44 -07:00
necromanceranne
12221be2b9 The Infiltrator Sneaksuit Bundle: Armor for (relatively) Cheap (#49608)
About The Pull Request

Redoing the pull request because it's changed so fucking much. Original over here #49550.

The Infiltrator Bundle is a sneaksuit set that allows the wearer the benefits of a decent armor set at a relatively low price of 6TC. The armor vest paired with the sneaksuit will equal a syndicate hardsuit, but only on the chest. It also carries none of the benefits of the hardsuit, such as EVA.

The bundle comes complete with the following items:

Infiltrator Helmet: It's a insidious helmet. Has flashproofing.
Infiltrator Vest: It's roughly equal to an armor vest, but a lot wearker against lasers and disablers.
Blood-red Sneaksuit: It's the highest armored undersuit in the game, at 10 across the board.
Infiltrator Balaclava: Equal to an explorer mask in armor, and has a diagnostic hud built in. It also distorts your voice, so you always come up as 'Unknown' when speaking, even when you have another ID on. Obviously has anti-syngery with the Agent Card, but you're not wearing this to disguise as other people.
Infiltrator Gloves: Special combat gloves that allow you to fireman carry people more quickly.
Sneakboots: They muffle your footsteps completely!
Carrying Case: Storage container for the full suit and guns if you have them. Guns not included.

Also includes the Sleepytime Pajama Bundle for nukies.

Zawo and I have been passing this between us for a while trying to get this into a good state. Hopefully now it's worth an inclusion.
Why It's Good For The Game

A cheaper alternative to the Syndicate Balloon to indicate to everyone around you that you are probably valid.

A recognizable outfit that proves to be useful in minor ways and provide cheap armor for traitors. Nothing this grants is especially powerful on it's own, but it is a useful for traitors wanting to gain an edge at low cost.
Changelog

🆑 NecromancerAnne and zawo
add: The Infiltrator Bundle, an armor kit for 6TC. Murder people in style!
add: Some pajamas for nukies to get plenty of bed rest.
/🆑
2020-03-17 20:31:31 +13:00
Archanial
fe70399f97 Removes major and minor crime distinction, simplifies adding a crime in sechuds (#49591)
About The Pull Request

Removes minor and major crimes to simplify them, they are just "crimes" now.
Adding a crime is now 2 1 pop-ups instead of 3.
Instead of adding details in sechuds, you can add it in sec consoles or by viewing crime in hud.
Why It's Good For The Game

My goal was to simplify adding crimes to encourage security to actually do that.
Since the space law is only a roleplay suggestion, we don't need that distinction.
Changelog

cl
del: Deleted minor and major crimes (they are just crimes now).
tweak: Adding a crime (via sec huds) is now only 1 pop-up, seriously try it.
add: You can now add crime details in security consoles.
/cl
2020-03-17 10:58:51 +13:00
Tim
818643440d fix 2020-03-16 18:05:33 +01:00
kingofkosmos
79c5a80ca0 Visible_messages verb time tenses changed to present. 2020-03-16 14:55:25 +02:00
Jonathan (JJRcop) Rubenstein
c142446013 Drone documentation corrections 2020-03-16 04:30:37 -04:00