Commit Graph

21213 Commits

Author SHA1 Message Date
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
swindly b976845de3 Weaponizes station charters (#28111) 2017-06-06 20:40:01 -03: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
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
Leo a940b11037 Merge pull request #28083 from kevinz000/patch-210
Fixes projectile fields blocking clicks
2017-06-06 09:14:43 -03: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
Joan Lung 9f9d1ff2e1 Cogscarabs can no longer use guns (#28066) 2017-06-05 15:22:49 -03:00
Joan Lung 5884071627 Renames Clockwork Proselytizers to Replica Fabricators (#28062) 2017-06-05 14:52:31 -03:00
Joan Lung 180dd7bd84 Adds another unique KA mod to necropolis chests (#27982) 2017-06-05 14:52:03 -03:00
Expletive ed480ef08e Fixes problems that were in the original PR (#28099) 2017-06-05 13:55:30 -03:00
Jordan Brown 226a37b2ca Graceful shutdown now asks the server to kill it 2017-06-05 11:52:20 -04:00
Leo aada38ff3c Removes check_tick from ORM ui_data 2017-06-05 09:49:11 -03:00
Joan Lung 41e3120356 Merge pull request #28057 from Expletive/tguiorm
Ports the Ore Redemption Machine to TGUI
2017-06-05 08:43:08 -04:00
Expletive a4063f5488 Add text fields, rglass smelting, style changes, sheet insertion. 2017-06-05 04:37:47 -07:00
kevinz000 4e106b42e1 Update peaceborg_dampener.dm 2017-06-04 20:24:50 -07:00
Leo f7fbec3669 Merge pull request #28048 from kevinz000/patch-204
Makes the admin repair buildmode templates work
2017-06-05 00:23:34 -03:00
InsaneHyena 5713a44048 Removes donut steelpoint (#28041) 2017-06-05 00:12:26 -03:00
Leo 267c7622fd Merge pull request #28045 from WJohn/fixes_suit_store
Fixes suit_store not working for ghost roles.
2017-06-04 21:23:51 -03:00
QualityVan 12e1a95535 Makes cable small again 2017-06-04 17:58:25 -04:00
Cyberboss 375a90daaa Add status string for server tools 2017-06-04 16:15:10 -04:00
Jordan Brown d7ebd649ba Refactors the latejoin list (#26647) 2017-06-04 17:07:46 -03:00
bawhoppen 0c491a9111 Removes ragin mages (#27872)
* good riddance

* tgstation.dme

* updates configs I guess

* removes other traces of ragin mages
2017-06-04 21:30:59 +02:00
Joan Lung e2aa40d1be When murdering mining mobs, the Hierophant will ignore legion skulls 2017-06-04 14:18:52 -04:00
Leo 39c4fb4aad Merge pull request #28036 from ChangelingRain/aoemodkitfix
Fixes AOE modkits not working because I messed up the logic
2017-06-04 12:28:44 -03:00
Cheridan 60c24c72d3 Merge pull request #28006 from ma44/nodontleave
Makes it clear to the syndicate lavaland base to not leave the base
2017-06-04 09:39:59 -05:00
Expletive f7df5244c7 Sacrificed a lamb to the dark gods of TGUI 2017-06-04 07:07:42 -07:00
Leo c1f272c283 Merge pull request #27975 from tgstation/RemieRichards-patch-1
Proposal: typed map variables
2017-06-04 09:49:03 -03:00
Leo 58b023b89a Merge pull request #28008 from optimumtact/spankmaster
we have to move forward with grammar fixes
2017-06-04 09:43:41 -03:00
AnturK 74febcf7bc Fixes bsa not showing up (#28032) 2017-06-04 09:42:50 -03:00
oranges 88d3650372 Refactor another spawn var (#28027) 2017-06-04 12:34:00 +02:00
oranges 24ead18666 Refactors another spawn cooldown var (#28023) 2017-06-04 12:30:18 +02:00
oranges d66900aaff This doesn't do anything (#28020) 2017-06-04 12:28:58 +02:00
oranges 838cb9567c Gotta go with the fro2.0 (#28010) 2017-06-04 12:28:01 +02:00
oranges 49007e80e5 Remove a commented out function (#28019) 2017-06-04 12:24:18 +02:00
oranges 2f48ac07f2 Refactors a cooldown var to not require a spawn or sleep (#28011) 2017-06-04 12:16:21 +02:00
Expletive 94d3688cf8 Fixes #27989 : Riot suits no longer hide jumpsuits (#28003)
* Fixes #27989

* remove tag
2017-06-04 12:12:30 +02:00
Expletive 70cdc48376 Fixes #27979 (#28002) 2017-06-04 12:11:44 +02:00
Expletive ac34fc041a new branch from updated master 2017-06-03 23:38:25 -07:00
kevinz000 ca4efb04e9 Beam rifles now slowdown while scoped (#27898)
* Update beam_rifle.dm

* Update beam_rifle.dm

* Update beam_rifle.dm
2017-06-04 07:12:22 +03:00