Commit Graph

8487 Commits

Author SHA1 Message Date
LemonInTheDark 8746f42759 BoH modifications [headcoder orders] (#50083)
* Adds a sanity check to boh_tear process

* WHYYYYY
2020-03-21 17:09:36 +01:00
ArcaneMusic b737f267f3 you thought (#50057) 2020-03-21 17:07:30 +01:00
nemvar f6bb710cc9 renames wet leather to wet hide (#50092) 2020-03-21 09:47:58 -03:00
nemvar 3883f6200d Fixes rolling paper (#50091) 2020-03-21 09:47:24 -03:00
ArcaneDefence 946255412a Adds a suicide to moth plushies (#49878)
* Adds a suicide to moth plushies

The user gets stripped and dusted, adding one to a kill counter

* Adds hellbound check shame state

* Attempts to meet expectations

Adds doc for var/suicide_count, var/divine, removes the shame results, replaces the theme of soul-eating with consuming/killing the user, removes the do_after, and puts the death proc in the dust proc after the unequip so that the plushie doesn't spam the squeak sound for every item the user was wearing.

* Accepting reality for what it is

* Method to prevent squeak spam

* Changes as suggested
2020-03-20 19:08:16 -04: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
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
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
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
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
iamgoofball fee67356ea Families Update 1: Preference for roles, Space Cop Ballistics, Balance Tweaks, Fixes 2020-03-14 22:59:47 -07: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