Commit Graph

22290 Commits

Author SHA1 Message Date
ShizCalev 6e59b20716 Syndicate Uplink - Typos & Grammar mk2 (#28145) 2017-06-07 16:55:18 -03:00
Expletive 12d522dbc0 Organs for catgirls (#28148) 2017-06-07 16:15:33 -03:00
Jordan Brown 674e15978e Fixes + Stats 2017-06-07 14:52:17 -04:00
Jordan Brown 4c580de459 Fixes deadmin player panel runtime 2017-06-07 14:32:44 -04:00
Xhuis 3cd73b8b84 this time it compiles! 2017-06-07 14:31:10 -04:00
Xhuis 9aabc2db28 grumble grumble 2017-06-07 14:30:17 -04:00
Xhuis 77fddc4e69 does the thing 2017-06-07 14:11:03 -04:00
Tacolizard 8a337ebab8 140 char limit 2017-06-07 09:06:44 -07:00
Tacolizard 0bfa8e3bc4 real_name 2017-06-07 09:06:07 -07:00
Expletive 78473ac024 Resprite fedoras, Curator and Detective hats are now subtypes of fedora. All benefit from hair extensions 2017-06-07 09:03:19 -07:00
Jordan Brown 5a6053db57 Fixes to_chat with lists 2017-06-07 11:11:01 -04:00
Jordan Brown 45aa3f8a3e Make it use asset cache 2017-06-07 11:00:16 -04:00
Jordan Brown 1fecdd2fe4 Make it use rsc html 2017-06-07 10:59:56 -04:00
Jordan Brown a3c8e153fd Removes a spawn 2017-06-07 10:53:22 -04:00
kevinz000 99138f12d0 I might HAVE accidently made dualwielding hilariously OP again so have a nerf! (#28125) 2017-06-07 11:13:57 -03:00
Leo 4f3d720c93 Merge pull request #28124 from Shadowlight213/whywasthisevenadded
Adrenaline and freedom implants in rnd have been replaced with tracking and chem ones
2017-06-07 11:07:13 -03:00
Jordan Brown 08d21fd1aa Fixes ghosts not returning an initialize hint 2017-06-07 09:56:21 -04:00
Leo a9d9e986ef Merge pull request #28122 from LanCartwright/fixesgel
Lowers Uranium virology reagents down to 1 from 5
2017-06-07 09:38:37 -03:00
Jordie 73882dcc49 Fix to round_id and .getserverlog (#28130) 2017-06-07 09:37:53 -03:00
kevinz000 c5fce5b01e gas miners only update overlays when they actually need to (#28114)
* Update miner.dm

* Update miner.dm
2017-06-07 09:06:18 +02:00
Expletive 01d8d95749 Woops 2017-06-06 22:38:27 -07:00
Expletive c18492d87f I never want to do that again 2017-06-06 22:26:39 -07:00
Tacolizard f52ee11f64 indentation 2017-06-06 20:47:19 -07:00
Tacolizard d846f0a3da Update accessories.dm 2017-06-06 20:34:34 -07:00
Tacolizard c1bb49496c wew missed some indentation 2017-06-06 19:57:11 -07:00
Tacolizard f2356f44ac remove space 2017-06-06 19:52:10 -07:00
Tacolizard def6e2f4d0 fix indentation 2017-06-06 19:51:31 -07:00
Tacolizard 46a529faff fix merge conflict 2017-06-06 19:43:09 -07:00
Tacolizard 2f7c74e813 Initial 2017-06-06 19:40:39 -07:00
Expletive 8413960d8e A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) (#28115) 2017-06-06 22:26:56 -03:00
Jordan Brown e6bfb7f449 Refactors datum verbs to be general (#28109) 2017-06-06 22:21:26 -03:00
Expletive 12092620ab make readable 2017-06-06 18:12:55 -07:00
Expletive e34cf1445f Make it work the same 2017-06-06 17:07:43 -07:00
Expletive 0de059e60b Soundbangs use AdjustEarDamage 2017-06-06 17:02:38 -07:00
swindly b976845de3 Weaponizes station charters (#28111) 2017-06-06 20:40:01 -03:00
QualityVan 454bb4d831 Fixes ORM alloy material consumption 2017-06-06 19:05:29 -04:00
Jordan Brown b8094b48f3 Fixes logged out spawning new_players (#28105) 2017-06-06 15:27:27 -03:00
Leo 54a15e9dfa Merge pull request #28102 from Cyberboss/patch-106
Graceful shutdown now asks the server to kill it
2017-06-06 15:25:35 -03:00
kevinz000 703cff4953 Merge branch 'master' into gang_points_refactor 2017-06-06 08:48:51 -07:00
Joan Lung cffc868325 KA modkits in necropolis chests are now design discs to force miners to bring back minerals (#28098) 2017-06-06 12:25:03 -03:00
Jordan Brown ccfaf07a5a Merge branch 'goonchatv3' of https://github.com/Cyberboss/tgstation; branch 'master' of https://github.com/tgstation/tgstation into goonchatv3 2017-06-06 09:18:44 -04:00
Leo a940b11037 Merge pull request #28083 from kevinz000/patch-210
Fixes projectile fields blocking clicks
2017-06-06 09:14:43 -03:00
Shadowlight213 0150de51c3 Adrenaline and freedom implants in rnd have been replaced with tracking and chem ones 2017-06-05 20:58:12 -07:00
Akke dd313992c1 lowers gel cost to 1 from 5 2017-06-06 04:47:52 +01:00
4DPlanner c7d8e5b5f7 Merge remote-tracking branch 'upstream/master' into datum - I genuinely
have no idea how this was a merge conflict and also fixes paren
2017-06-06 02:49:04 +01:00
kevinz000 f051ecba25 Adds consciousness checks to beam rifles (#28079) 2017-06-05 22:37:54 -03:00
Leo 09be4ac25c Merge pull request #28069 from QualityVan/cableweight
Makes cable great again
2017-06-05 18:38:57 -03:00
Leo 8b6d319cfd Merge pull request #28068 from Cyberboss/ReaddIRCCheck
Add status string for server tools
2017-06-05 18:28:11 -03:00
WJohn f6063b936f Adds some more syndicate equipment. (#28046) 2017-06-05 15:50:11 -03:00
Leo 30863f29d6 Merge pull request #28064 from ChangelingRain/hierophanttweak
When murdering mining mobs, the Hierophant will ignore legion skulls
2017-06-05 15:26:07 -03:00