Commit Graph

13933 Commits

Author SHA1 Message Date
kevinz000
38536cd02d repath that 2020-02-06 00:05:07 -07:00
kevinz000
134b7b811d repath that 2020-02-06 00:04:11 -07:00
kevinz000
9a4432b3ac initial commit 2020-02-06 00:03:17 -07:00
kevinz000
927b9d0622 Revert "Merge pull request #10883 from ancientpower/ghost-newscasters"
This reverts commit 3c5a3cb4d4, reversing
changes made to 109b15ebdd.
2020-02-05 23:50:41 -07:00
kevinz000
3c5a3cb4d4 Merge pull request #10883 from ancientpower/ghost-newscasters
Allows ghosts to read newscasters and books
2020-02-05 23:46:04 -07:00
kevinz000
cda01e10f6 Merge pull request #10885 from Ghommie/Ghommie-cit553
Removing a couple troublesome NSFW useless and unused preferences.
2020-02-05 23:45:30 -07:00
kevinz000
50cabc3c64 Merge pull request #10889 from Ghommie/Ghommie-cit555
runtime drifting
2020-02-05 23:44:52 -07:00
kevinz000
d0cd33a5ea Merge pull request #10899 from Trilbyspaceclone/vender-hate
Almost all venders now can be restocked
2020-02-05 23:44:30 -07:00
kevinz000
27d3fcf5fd Merge pull request #10900 from Putnam3145/port-atmos-fix
Ports atmos priority reaction mix from TG
2020-02-05 23:44:08 -07:00
kevinz000
5059c0fa8c Merge pull request #10905 from Hatterhat/engishit
consoleless interfaces default, standard RCD ammo added to industrial engi
2020-02-05 23:43:54 -07:00
Ghom
181944bb36 Update admin_ranks.dm 2020-02-06 03:07:42 +01:00
r4d6
10490e1c15 3 minutes it is 2020-02-05 21:03:34 -05:00
r4d6
8430ee3684 Timer 2-5 minutes 2020-02-05 20:58:26 -05:00
Hatterhat
f100b6c5e4 multitools in basic tools, dumb headers 2020-02-05 19:47:20 -06:00
Ghommie
639ec8066d Another typecheck 2020-02-06 02:19:14 +01:00
Ghommie
60b6d96f45 typecheck. 2020-02-06 02:17:51 +01:00
Ghommie
233ed5873f race conditions and turfs beings special. 2020-02-06 01:13:28 +01:00
Seris02
26e16d7c89 yeet 2020-02-06 07:49:19 +08:00
keronshb
5d1d652ea4 Buffs the Pirate Ship to be bomb proof
Title, also makes a few computers/machines indestructible and buffs turret health.  It also allows turrets to be repairable now.
2020-02-05 18:28:00 -05:00
Ghommie
ab06c23a2b runtime is forever, errors are eternal. 2020-02-05 23:48:17 +01:00
Arturlang
23834ce3f5 Parent call
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-02-05 22:54:01 +02:00
Ghommie
01d8086ebd Lavaland's Herald speech fix. 2020-02-05 21:12:15 +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
Ghom
6d78d01612 Merge pull request #10903 from Hatterhat/tg-47770
fuck organ decay - tgstation#47770
2020-02-05 19:26:40 +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
Seris02
ee7064840d merge conflicts fixed finally 2020-02-05 18:42:16 +08: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
617d0c0afa armor 2020-02-05 00:26:47 -07:00
kevinz000
40ab6bdd41 changes 2020-02-05 00:22:12 -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
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
Trilbyspaceclone
1547f99ddb Update carp.dm 2020-02-05 00:59:16 -05: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
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