Commit Graph

21179 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Leo
c9efec58f0 Merge pull request #27935 from Expletive/botanicaldispenser
Gives the pod people's dispenser all the chemicals they could ever want.
2017-06-03 04:30:39 -03:00
Expletive
3b7c458925 Rework chem dispensers to use battieries instead of var/energy. (#27933) 2017-06-03 04:29:34 -03:00
kevinz000
2f8f238e07 Beam rifles now forcefully delete their tracer effects. The user now faces where they're aiming. (#27936) 2017-06-03 04:27:56 -03:00
Leo
996754ac25 Merge pull request #27938 from kevinz000/patch-199
Beam rifles can no longer be fired from inside containers. Neither will they work unless you're, you know, holding it.
2017-06-03 04:26:19 -03:00
oranges
9f61f827f9 gotta go with the fro 2017-06-03 06:13:56 +00:00
ma44
8708457853 really clear man 2017-06-03 01:05:12 -05:00
factoryman942
445595c1ae Revert "Revert "Revert "Revert "Revert "Revert "Typos in syndicate uplink descriptions"""""" 2017-06-03 05:57:20 +01:00
oranges
9406993cd9 Revert "Revert "Revert "Revert "Revert "Typos in syndicate uplink descriptions"""" (#27995)"
This reverts commit 05b06635f5.
2017-06-03 16:56:49 +12:00
factoryman942
05b06635f5 Revert "Revert "Revert "Revert "Typos in syndicate uplink descriptions"""" (#27995) 2017-06-02 23:03:29 -05:00
Joan Lung
467263c2a1 Bad oranges. Stop readding typos.
Bad.
2017-06-02 22:21:40 -04:00
oranges
7d4f0d7ad0 Revert "Revert "Revert "Typos in syndicate uplink descriptions""" 2017-06-03 14:11:32 +12:00
Kyle Spier-Swenson
5bb97ce93f Revert "Revert "Typos in syndicate uplink descriptions"" 2017-06-02 19:10:42 -07:00
oranges
f598aefd2e Merge pull request #27955 from tgstation/revert-27878-typos
Revert "Typos in syndicate uplink descriptions"
2017-06-03 14:09:53 +12:00
oranges
6cf2416280 Merge pull request #27939 from kevinz000/patch-200
Fixes an incorrect line in beam rifle vars
2017-06-03 13:37:54 +12:00
AnturK
1a810315e0 Fixes sortedAreas use. 2017-06-02 22:15:41 +02:00
Remie Richards
7324d71107 Proposal: typed map variables
This is a thing DM has, we don't use it, perhaps we should?
2017-06-02 21:14:17 +01:00