Commit Graph

6066 Commits

Author SHA1 Message Date
Rohesie
96810ba7c0 incapacitating traits (#50270) 2020-03-29 16:12:08 +08:00
Ghilker
22cf0dc785 Freon fixes, tweaks and balancing (#50153)
* balancing, fixes, tweaks

* freon specific_heat increase

* fix an issue with negative temperature

* changed HyperNob canister color

* done change request and tweaked more the hardcap limit
2020-03-28 21:31:35 +01:00
Qustinnus
c1d7d28116 Fix repeat "achievement unlocked' messages (#50066) 2020-03-28 11:48:21 -07:00
Fikou
a59e4fb1b5 merges civilian and service departments (#50142)
* merges the service and civilian departments

* yee haw
2020-03-26 22:05:28 +08:00
Garen Crownguard
c2c2ac8e69 Caltrop effects require standing (#50161) 2020-03-25 17:57:46 +08: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
RiskySikh
3ed253dcf3 grammarfix2 (#50107) 2020-03-21 10:30:17 -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
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
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
Time-Green
b6eadf4547 updates comment 2020-03-19 17:00:52 +01:00
uomo91
1d7b95511c Merge branch 'master' into psychologist 2020-03-19 05:33:15 -05: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
ShizCalev
55f8dd7e35 Merge pull request #49940 from ArcaneMusic/quickfix
Fixes a few issues with datum tables.
2020-03-17 22:28:29 -04:00
Time-Green
d71964564d Fixes a dumb runtime and being able to spin anchored plumbing machines 2020-03-17 17:58:27 +01:00
kevinz000
d5cd073887 Merge remote-tracking branch 'tgstation/master' into movespeed_modifiers_take_two 2020-03-17 09:48:02 -07:00
TiviPlus
8e2ac283ed Small grammar stuff (#50016) 2020-03-17 12:23:40 -04: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
skoglol
60cdc81c07 Merge pull request #49756 from IndieanaJones/blobtweaks
Blob Minor Buffs
2020-03-17 01:20:15 +01: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
Ryll Ryll
733559856f Lets you untie peoples shoelaces (#49817)
About The Pull Request

This PR adds some extra hijinx opportunities to the game. By laying down next to someone and opening their equipment stripping menu, you can untie their shoelaces. Once their shoelaces are untied, you can then knot them together. Moving with untied shoelaces has a very low chance to cause you to stumble and drop what you're holding, while moving with knotted together laces makes you trip and fall over. Luckily, you can unknot and retie them by clicking them on your equipment panel!

Messing with someone's laces, like pickpocketing, produces no tell unless you fail the do_after (like if the target moves), at which point the shoe-wearer stamps on your hand and deals some damage. If you don't notice the clown (or whoever) crawling up next to you and laying still for ~10-20 seconds though, then you probably deserved to get stunted on.

Clumsy mutation makes you 33% faster (most shoes are 5 seconds to lace/unlace/knot/unknot, while boots are 9-10 seconds). Sandals and flip-flops are, obviously, exempt from this nonsense.
Why It's Good For The Game

Pranks are fun and funny
Changelog

🆑 Ryll/Shaps
add: You can now untie and knot up people's shoelaces! You can do so by laying down next to the person, dragging their sprite onto yours, then clicking "untie/knot shoes" next to their shoes.
/🆑
2020-03-16 20:48:56 +13: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
uomo91
478b1ed965 Adds an heirloom item (empty pill bottle) for the psychologist. 2020-03-15 02:47:31 -05:00
ArcaneMusic
d276d08725 Fixes a few mat datum issues. 2020-03-13 23:41:32 -04:00
skoglol
cf247d0e9c Merge pull request #49820 from Timberpoes/geneupdates
Allow DNA Consoles to show compatible chromosomes for activated mutations
2020-03-14 02:10:05 +01:00
wesoda25
a34e81d426 Adds a couple mood events (#49918)
* bang!

* Dr. Joseph-Ignace *********
2020-03-14 01:58:18 +01: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
kevinz000
052c50aef1 wack 2020-03-11 22:54:56 -07:00
kevinz000
48bc3fdd64 Merge branch 'master' into movespeed_modifiers_take_two 2020-03-11 17:19:27 -07:00
SteelSlayer
d4005b2170 Label component code fixes (#49855)
* Label component additions that should have been included

updates comments

forget this

* fix spelling mistake

* I suck at spelling

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2020-03-11 15:30:17 +08:00
Fikou
cb923d982d plastic is now a rigid material (#49838) 2020-03-10 18:35:44 +08:00
XDTM
fe402c2699 fixes regen coma (#49834) 2020-03-10 16:47:26 +08:00
kevinz000
2c25b2cdfd Merge branch 'master' into movespeed_modifiers_take_two 2020-03-10 00:59:01 -07: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
EdgeLordExe
ff88807696 MMh yes i know this type of stone: Mining skill QOL (#49746)
* yeah

* kekw
2020-03-09 19:06:02 -07:00
EgorDinamit
cb6be8bd68 Merge branch 'master' of git://github.com/tgstation/tgstation 2020-03-09 12:35:20 +04:00
Iamgoofball
3203f19290 The Families Gamemode. Home. At least it was 'til I fucked everything up. (#49274)
Adds the Families gamemode to the codebase. In this 1 hour showdown, 
multiple criminal families are placed onto the station with their goal 
to rack up the most points by the end of 1 hour. At which point, the 
Space Cops hit up the station to crack down on the family activity. The 
severity of the Space Cops is based on how much carnage and murder the 
families have committed.

## Why It's Good For The Game

With an actual official medium/heavy RP server, and the codebase taking 
a much harder swing towards heavier consequences for death, a more 
player focused gamemode with a unique swing on teamwork, the concept of 
what exactly is an antagonist, and trust/paranoia will do wonders to 
help improve that atmosphere.

Previous tests went extremely well(when administrators weren't 
intentionally sabotaging it by welderbombing families as the Head of 
Security every single round immediately with no escalation), but 
suffered from "this just isn't a gamemode for no RP servers like /tg/".

However, /tg/ is now an RP server.

Get ready to rep your family.

## Isn't this just Gang?
Heck no. Only thing similar is tagging turf and the fact criminal 
groups are involved. This mode is completely different otherwise.

## Heck yeah, where do I sign up?
Ask a family member where their Signup Point is, and then simply click 
on it with an open hand. You'll be signed up for the family instantly, 
and given some sick threads and a spraycan for tagging.

## How do I rep my family?
Wear your gang's uniform or colors similar.

## What does it mean to roll with a crew?
Travel in a group of four or more for bonus points towards your gang.
However, you receive less for having eight or more, so be careful. Try 
to spread your crews out!

## I'm an X, what do?
Gangster: Yeah, go do whatever. Wanna backstab your gang? Go for it. 
You can switch sides at any time by clicking on an enemy gang's sign up 
point. Wanna murder some snitch because they ratted you out to the 
pigs? Do it. Wanna pressure the locals into supplying you with goods to 
export? Emergent gameplay.
Civilians: Wanna join a gang? Go for it. Gangsters probably shouldn't 
be arbitrarily murdering you, but if you're repping someone else's 
colors, don't expect to be given a free pass. After all, uniforms are 
the only way to really identify a gang member.
SPACE COP: Get rid of all the gangsters. Secure the station. Protect 
the law. Uphold the law. Eat donuts.

## No huds? How can I tell if someone's part of my group?
Tough shit, man. I hope you like trust.

In short, this gamemode will be a fun exercise in how far the 
playerbase can go in regards to trusting eachother and unifying to meet 
a common goal for their group with no rules, gameplay mechanics, or 
anything actively forcing them to work together.

## How do I know if someone is a gangster?
1. Are they wearing a gang uniform/color?
   If yes, they're probably a gangster.
   If no, they're probably a civvie.
2. Are they attacking gangsters?
   If yes, they're probably a gangster.
   If no, they're probably a civvie.
2020-03-08 18:33:54 -07:00
EgorDinamit
f83bbf662e Merge pull request #8 from tgstation/master
Fixing merge problems
2020-03-08 20:54:46 +04:00
Timberpoes
276c20cd98 Modifications to allow DNA Consoles to show compatible chromosomes for activated mutations 2020-03-08 13:23:31 +00:00
ArcaneDefence
7f4c49fce2 Removes pacifist cqc neck grab bug (#49776)
Adds a check for pacifism before upgrading to a neck grab via chokehold combo.
2020-03-08 20:20:04 +08:00
EgorDinamit
7e8115e878 Merge branch 'master' into master 2020-03-08 15:08:50 +04:00
ShizCalev
c3ebb6f135 Merge pull request #49747 from tralezab/patch-84
caltrops damage you after they send a visible message
2020-03-06 21:44:11 -05:00
ShizCalev
4c846ff6e2 Merge pull request #49742 from nightred/offhand-issue
Off hand item drop fix
2020-03-06 17:41:16 -05:00
tralezab
43ec902cd1 fixes unremovable mutations, fixes weird tail organ shennanigans (#49771)
* THE mutations fix

* removes !owner

* removes redundant code (yay)
2020-03-06 23:39:50 +01:00
nightred
baf9ef3e19 one more useless check removed 2020-03-06 09:49:50 -06:00
nightred
695fec66c2 remove some TK checks that are dead 2020-03-06 09:47:53 -06:00
IndieanaJones
0ec9805760 Update saymode.dm 2020-03-06 01:34:33 -05:00