Commit Graph

9281 Commits

Author SHA1 Message Date
Rohesie
9d4eb582ac Merge pull request #49563 from Fikou/clarke
[READY] Adds Clarke, your new mech buddy!
2020-03-19 18:29:49 -03:00
Fikou
6ea85d346d FIXES A COMMENT IN HIGHLANDER CLAYMORE NOT BEING IN ALL CAPS!!!! #49976
ABOUT THE PULL REQUEST

ON THE 18TH OF SEPTEMBER 2019 SPOOKYDONUT BROKE THE SACRED RULE OF HAVING ALL COMMENTS ON THE HIGHLANDER CLAYMORE BE IN ALL CAPS
I WILL FIX WHAT HAPPENED ON THIS SAD DAY WITH THIS PR
WHY ITS GOOD FOR THE GAME

WE MUST RESTORE BALANCE TO THE WORLD
2020-03-20 09:38:38 +13: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
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
ShizCalev
4516f731b6 Merge pull request #50044 from necromanceranne/baton_fix
quick and dirty fix to classic batons
2020-03-17 21:56:37 -04:00
RiskySikh
5b66eafd66 Removes the Emag functionality from the Goat Plushie + small fixes (#50023)
* GoatPlushie

Removes emagged plushie

* GoatPlushiePart2
2020-03-17 19:54:12 -04:00
necromanceranne
cfcab7ebab quick and dirty fix to one of my mistakes 2020-03-18 07:44:35 +11:00
kevinz000
d5cd073887 Merge remote-tracking branch 'tgstation/master' into movespeed_modifiers_take_two 2020-03-17 09:48:02 -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
ShizCalev
3f9920db1a Merge pull request #49956 from Iamgoofball/comrade
Families Update 1: Preference for roles, Space Cop Ballistics, Balance Tweaks, Fixes
2020-03-17 03:23:06 -04: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
kingofkosmos
79c5a80ca0 Visible_messages verb time tenses changed to present. 2020-03-16 14:55:25 +02:00
zxaber
f2e8841d3a Makes borg upgrade cards small items #49748
About The Pull Request

Borg upgrade cards didn't have a weight class and defaulted to normal size. This sets the size to them to be small. Only the upgrade card itself is affected, no change in any of the tools or effects that result from the card's installation into a borg.
Why It's Good For The Game

These are visually smaller than computer boards, it makes no sense that I can't stick the reboot board into my box.
Changelog

🆑
balance: Borg upgrade cards are now small items.
/🆑
2020-03-16 20:45:00 +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
iamgoofball
90130f4d9b aaargh 2020-03-15 03:30:23 -07:00
uomo91
4daa91135b Merge branch 'master' into psychologist 2020-03-15 05:19:03 -05:00
iamgoofball
fee67356ea Families Update 1: Preference for roles, Space Cop Ballistics, Balance Tweaks, Fixes 2020-03-14 22:59:47 -07:00
uomo91
f8f4aeda93 Gives the psych headset its own enc. key icon and makes it use it. 2020-03-14 14:37:08 -05:00
uomo91
271febc427 Gives the psychologist a medbay/service headset. 2020-03-14 14:22:33 -05:00
LemonInTheDark
3fe28a79ca Fixes brooms again, this one got caught in a refactor, don't mind me, just sweeping up (#49928) 2020-03-14 16:54:08 +08:00
cacogen
311281b490 Geiger counter doesn't bludgeon when scanning anymore (#49929) 2020-03-14 16:51:25 +08:00
ArcaneMusic
d276d08725 Fixes a few mat datum issues. 2020-03-13 23:41:32 -04:00
skoglol
8b4a98b0ed Merge pull request #49752 from spookydonut/weathertimers
Make barometers more accurate
2020-03-14 02:25:42 +01:00
skoglol
76b28f5de6 Merge pull request #49788 from Timberpoes/genefixes
Various fixes to Genetics codebase and DNA Consoles
2020-03-14 02:16:19 +01:00
skoglol
d46512d63c RCD silo link message fix (#49844)
* RCD silo link message fix

* RCD silo log fix

* Update code/game/objects/items/RCD.dm

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

* Update code/game/objects/items/RCD.dm

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

* Update code/game/objects/items/RCD.dm

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
2020-03-14 02:05:15 +01:00
skoglol
554301a22a Merge pull request #49906 from ShizCalev/ied-fix
Fixes spawned IEDs not having cans
2020-03-13 18:03:38 +01:00
spookydonut
4ca8f8086c Remove ui deadcode (curse you) (#49864)
Aha cheers!~
2020-03-13 07:07:01 +02: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
ShizCalev
19034e3d77 randomize the cans 2020-03-12 02:48:14 -04:00
ShizCalev
7ddc9511f2 Fixes spawned IEDs not having cans 2020-03-12 02:35:38 -04:00
kevinz000
48bc3fdd64 Merge branch 'master' into movespeed_modifiers_take_two 2020-03-11 17:19:27 -07:00
Victor Pellen
8906df5a86 Fixes empty tape recorders getting stuck on pocket and belt slots (#49865)
* Fixes tape recorders getting stuck on pocket and belt slots

* Inverted the branch into a fallthrough
2020-03-11 15:26:39 -04:00
Tlaltecuhtli
404a26c74d aloe medical plant addition (#49444)
* 1

* 2

* removal of id and names

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

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

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

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

* Update code/game/objects/items/stacks/medical.dm

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

* Update code/game/objects/items/stacks/medical.dm

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

* lowers price for med suture

* one aloe microwaved to 2 paste

* changes grind

* 🍆

* Update lavaland_surface_ash_walker1.dmm

* merg conflic

* ????????????

* Apply suggestions from code review

* reset travis

* reverts travis reset commit

cringe cringe cringe

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-03-11 11:54:41 -04:00
Dennok
687ef08c09 Update code/game/objects/items/RCD.dm
Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>
2020-03-11 08:20:59 +02:00
Dennok
cf9e5e2cb1 Update code/game/objects/items/RCD.dm
Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>
2020-03-11 08:20:41 +02:00
Dennok
e22dd9ae1e Update code/game/objects/items/RCD.dm
Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>
2020-03-11 08:20:16 +02:00
Unit2E
2a239de7cf fixes toy dualsabers gaining damage (#49789)
* clean fix for toy problem

* did code suggestions
2020-03-10 17:16:10 -04:00
Timberpoes
1cea951de8 I am bad at github here's all the changes again fixing various genetics bugs 2020-03-10 12:36:42 +00:00
kevinz000
2c25b2cdfd Merge branch 'master' into movespeed_modifiers_take_two 2020-03-10 00:59:01 -07:00
ShizCalev
79c98aee63 Merge pull request #49830 from Bokkiewokkie/It's-spriting-time-again
Adds tons of sheet inhands and makes them be obstructed by your body when facing north.
2020-03-10 01:16:03 -04:00
Dennok
737639041f RCD silo log fix 2020-03-09 20:31:37 +02:00
Dennok
40efe1f496 RCD silo link message fix 2020-03-09 19:11:49 +02: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
Dennok
8a888c690c Fix on station jet air using and trails only on use. (#49567)
* Update carbon_movement.dm

* Carbon use jets before basic spacemove sources

Now carbons dont try propel yourself by thing around, when use jet.

* up

* Jet used when jet must be used

No more persistent jet air use

* Jet implant used when jet implant must be used

No more persistent jet implant air use

* TRUE and FALSE in carbon_movement.dm

* missing right-paren

* missing right-paren in imp

* better jetpack check

* better augment jetpack check

* augment jet toggle on fix

* fix m

* up

* Jet trails only on air use
2020-03-08 20:35:10 -04:00
Bokkie
69501ce8cb Smol fixes
Fixed some minor alignment/ orientation issues on the inhands of various sheets and adds a bit of missing code to the bronze tilesheets because it's parent is a tile instead of a sheet.
2020-03-09 01:15:24 +01:00
Bokkie
9d8eec7763 Second sheet inhand collection
added Plasteel, Plasma, Adamantine, Runite, Mythril, Alien alloy (shameless copy of the tile sprite) and Bamboo. Also changed all sheet sprites to be obstructed when your body is in front of it while you're facing north.
2020-03-09 01:15:24 +01:00