Commit Graph

21280 Commits

Author SHA1 Message Date
Ghommie
01d8086ebd Lavaland's Herald speech fix. 2020-02-05 21:12:15 +01:00
Artur
c2b68d0ba3 Adds debbuging 2020-02-05 20:35:24 +01:00
Artur
5602289013 Parent call
Failed to get in the previous commit for some reason.
2020-02-05 20:25:04 +01:00
Artur
9951f291fd Reviewer suggestions 2020-02-05 20:14:35 +01:00
Artur
f0b22a119d Interface routing and modifying uplink component 2020-02-05 20:03:36 +01:00
Ghom
6d78d01612 Merge pull request #10903 from Hatterhat/tg-47770
fuck organ decay - tgstation#47770
2020-02-05 19:26:40 +01:00
Ghom
69c4cde323 Merge pull request #10915 from Citadel-Station-13/kevinz000-patch-5
jackboot magpistols are a thing again
2020-02-05 19:22:36 +01:00
Ghom
deb1686ce2 Merge pull request #10911 from Tupinambis/StunbatonFUCK
Addendum to PR #10812. REGEN STAMINA WHATEVER FUCK COMBAT REWORK IS CONFUSING
2020-02-05 19:19:41 +01:00
Ghommie
7e2ad2b71f Fixing accidental nerfs to the magpistol. 2020-02-05 18:45:15 +01:00
Ghom
7e8bc10b8e Merge pull request #10894 from Trilbyspaceclone/carps
Buffs carps again
2020-02-05 18:32:18 +01:00
Artur
8b5e3e6004 Removes the shitty verb 2020-02-05 14:55:47 +01:00
kevinz000
3d7fef76f3 Update sniper.dm 2020-02-05 05:57:16 -07:00
kevinz000
67489d62d4 Update projectile.dm 2020-02-05 05:56:31 -07:00
kevinz000
643eeb9474 Update twohanded.dm 2020-02-05 05:05:11 -07:00
kevinz000
77667dc1d2 Update twohanded.dm 2020-02-05 04:51:16 -07:00
Seris02
ee7064840d merge conflicts fixed finally 2020-02-05 18:42:16 +08:00
kevinz000
a45038d214 Update pockets.dm 2020-02-05 03:31:55 -07:00
Seris02
d0100345fd done hopefully 2020-02-05 17:00:38 +08:00
Seris02
6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08:00
Feasel
10c2248577 [Balance Pass - Dissection Early Game Buff]
Doing this so science has some real ways to do science point generation.

Normal bodies are low enough in value that by the time you do a body normally, passive gen has already beaten too far.
So I just guaranteed success with better tools, but left a tiny bit off just for memes/ayylmao tools must be best.

Scapel - 90% success from 45% 

Advanced - 99% success from 65% success

Ayylmao - 100% Because ayylmao. 

Knife and shard adopt old-ish values because ghetto man should have a fun option (45% and 25%)

Now go gather dem bodies for SCIENCE!!!
2020-02-05 02:54:55 -06:00
kevinz000
f05d37b7fd Merge pull request #10855 from Trilbyspaceclone/patch-274
The Syndicats are run by aliens - Fixes Alien cargo crate to be  correction emag
2020-02-05 01:10:21 -07:00
kevinz000
8c737b6ce7 Update debuffs.dm 2020-02-05 00:43:42 -07:00
kevinz000
617d0c0afa armor 2020-02-05 00:26:47 -07:00
kevinz000
40ab6bdd41 changes 2020-02-05 00:22:12 -07:00
kevinz000
72ddaa2ded Update swimming.dm 2020-02-04 23:56:27 -07:00
kevinz000
477853891d Update twohanded.dm 2020-02-04 23:54:10 -07:00
Ghom
02d1761c0a Merge pull request #10747 from Citadel-Station-13/kevinz000-patch-11
shoving someone into a wall on the second shove now also disarms their weapon
2020-02-05 07:38:14 +01:00
Ghom
4cdade4b2d Merge pull request #10788 from Seris02/crushboots
crushing magboots for tators
2020-02-05 07:36:14 +01:00
Tupinambis
3539fa7603 Stunbaton PR had bad math didn't properly reduce effectiveness oops. 2020-02-05 00:31:54 -06:00
Ghom
402283e86a Merge pull request #10791 from Arturlang/more_bloodsucker_tweaks
[READY] Further tweaks to bloodsuckers
2020-02-05 07:23:36 +01:00
Ghom
4b1e3d216f Merge pull request #10583 from Putnam3145/arousal-tweaks
Consent logging
2020-02-05 07:19:37 +01:00
Ghom
68cbc3487a Update species.dm 2020-02-05 07:09:55 +01:00
Ghom
77eb7b8a96 Merge pull request #10812 from Tupinambis/StunbatonFUNCTIONAL
Stunbaton Balance Adjustments 2.0 (Unfucked Edition)
2020-02-05 07:02:11 +01:00
Trilbyspaceclone
1547f99ddb Update carp.dm 2020-02-05 00:59:16 -05:00
Ghom
472bddb5be Merge pull request #10869 from kevinz000/WHY
can we talk about how admin attack logs being viewable in game is not a good thing, alternatively "i want a word with whoever coded mech logging"
2020-02-05 06:52:20 +01:00
Ghom
aaa45f102e Merge pull request #10875 from ancientpower/m-bunny-ears
Adds bunny ear style for humans and anthromorphs
2020-02-05 06:50:10 +01:00
Ghom
16fbdd9054 Update Sleeper.dm 2020-02-05 06:45:24 +01:00
Ghom
6159c197bb Update persistence.dm 2020-02-05 06:30:50 +01:00
Ghom
57ac5c3d66 Update carp.dm 2020-02-05 06:12:57 +01:00
Hatterhat
bad4b5cb56 huskies 2020-02-04 22:13:03 -06:00
Ghommie
5dc1de1d04 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-05 04:34:54 +01:00
Trilbyspaceclone
4ecbd1e407 Update carp.dm 2020-02-04 22:00:33 -05:00
Trilbyspaceclone
fb2498781c Update carp.dm 2020-02-04 20:29:50 -05:00
Ghom
b4ba381b59 Merge pull request #10739 from r4d6/Dwarven_Language
Add a Dwarf Language
2020-02-05 02:03:42 +01:00
Hatterhat
6efe0dc273 haha what if i made everything interfacable 2020-02-04 18:55:19 -06:00
Hatterhat
385aea3d14 rcd ammo to indeng, typo 2020-02-04 18:50:09 -06:00
Hatterhat
fe717597da fuck fermichem 2020-02-04 18:35:26 -06:00
ancientpower
dd521ef009 i swear it compiled locally 2020-02-04 17:18:13 -06:00
ancientpower
5fb82a2e6b fixes for the requested changes' fixes 2020-02-04 17:10:02 -06:00
Ghom
642a8c4217 Merge pull request #10893 from Arturlang/TGUI_Next_Crafting
[READY]TGUI Next Crafting
2020-02-05 00:04:21 +01:00