Commit Graph

22290 Commits

Author SHA1 Message Date
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
kevinz000 94758b7c18 Update ores_coins.dm 2017-06-04 19:10:07 -07:00
kevinz000 5da9822c32 Update ores_coins.dm 2017-06-04 19:05:41 -07: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
Nick 70506a29ae the man with the 2 shotguns that blasted me to the end of the world with dualwielding. nerf (#27978) 2017-06-03 23:45:28 -03:00
Shadowlight213 217b88fe65 Fixes admiral recall (#27861) 2017-06-03 23:41:52 -03:00
Leo b642c88464 Merge pull request #27951 from ChangelingRain/wizardrods
Rod Form's damage now scales with how much it's upgraded
2017-06-03 23:41:03 -03:00
Cheridan aad23d5304 Merge pull request #27964 from Expletive/variablestacksize
[READY] Stacks will change item_states and w_class based on how full they are.
2017-06-03 19:02:57 -05:00
Cheridan cf45dad242 Merge pull request #27977 from AnturK/fixes-turret-control
Fixes sortedAreas in templates
2017-06-03 18:00:12 -05:00
Cheridan 67754966ca Merge pull request #27874 from Tacolizard/ayy
ayys are more likely to visit the station
2017-06-03 17:55:09 -05:00
kevinz000 2e261085e1 Update repair.dm 2017-06-03 14:43:52 -07:00
WJohn 807ade5040 Fixes suit_store not working for ghost roles. 2017-06-03 17:13:59 -04:00
kevinz000 cc340cb73b stuff 2017-06-03 14:00:14 -07:00
Expletive 73d65ceb82 The Crafting Menu now has subcategories! (#27863)
* subcategories also it's broken

* It works!

* Fix pneumatic cannon recipe

* Some fixes and changes

* Reformats ui, removes redundant chat messages

* Remove comment

* while im at it
2017-06-03 19:28:14 +02:00
kevinz000 ff98ec2a42 Lowers supermatter damage hardcap by 75% to compensate for high speed atmos processing (#27905)
* Update supermatter.dm

* Update supermatter.dm

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2017-06-03 18:57:40 +02:00
Leo 2dab6cf292 Merge pull request #27968 from Cyberboss/patch-104
Fixes roundstart ntnet runtime
2017-06-03 12:57:47 -03:00
Joan Lung 807a778b4c Fixes AOE modkits not working because I messed up the logic 2017-06-03 09:39:17 -04:00
KorPhaeron b1aaa27f0d Revert "[s]Revert "Revert "Revert "Revert "Revert "Revert "Typos in syndicate uplink descriptions""""""" (#28035) 2017-06-03 14:34:01 +01:00
Joan Lung 9434c97361 Merge pull request #27998 from factoryman942/revert-27997-revert-27995-revert-27991-revert-27990-revert-27955-revert-27878-typos
[s]Revert "Revert "Revert "Revert "Revert "Revert "Typos in syndicate uplink descriptions""""""
2017-06-03 09:21:10 -04:00