Commit Graph

54518 Commits

Author SHA1 Message Date
FrozenGuy5
6c7534ff20 Removes the empty moth language file 2018-02-13 14:30:45 +00:00
ShizCalev
bf901492bf Fixes invalid throwat args (#35565) 2018-02-13 14:13:48 +01:00
tgstation-server
6e70cdb493 Automatic changelog generation for PR #35560 [ci skip] 2018-02-13 03:39:50 -08:00
Dax Dupont
c9b79c918c Adds tada emoji (#35560) 2018-02-13 09:39:47 -02:00
ShizCalev
5a07158b37 Fixes scooter runtime 2018-02-12 23:42:24 -06:00
YPO
5bf85ab3ff Fixes blood contracts being unusable if the popup is cancelled 2018-02-12 23:41:41 -06:00
tgstation-server
3494dee624 Automatic changelog compile, [ci skip] 2018-02-13 03:42:53 +00:00
tgstation-server
bc96c18ae4 Automatic changelog generation for PR #35354 [ci skip] 2018-02-12 19:11:07 -08:00
Buggy123
48797f8997 Tritium now produces water vapor when combusting. (#35354)
* HYDROGEN+OXYGEN=WATER

* Burning Tritium now produces a lot of radiation.

* Fixes check and line positions

* No longer spews absurd quantities of radiation.
2018-02-12 21:11:04 -06:00
tgstation-server
d349664b80 Automatic changelog compile, [ci skip] 2018-02-13 01:59:05 +00:00
oranges
183e94b185 Merge pull request #35598 from ShizCalev/announcement-exploit-fix
[s] fixes announcement system exploit
2018-02-13 14:32:58 +13:00
tgstation-server
9294302f6b Automatic changelog compile, [ci skip] 2018-02-12 22:49:59 +00:00
vuonojenmustaturska
707b04d8ed Merge pull request #35557 from ShizCalev/pda-virus-fix
Fixes PDA virus runtime
2018-02-13 00:31:55 +02:00
Jordan Brown
097e0dd71e Merge pull request #35603 from MrStonedOne/patch-480
blacklists 512.1408 for basically being a wallhack (again)
2018-02-12 17:23:40 -05:00
Kyle Spier-Swenson
3494d14c60 More blacklisting 2018-02-12 14:14:03 -08:00
tgstation-server
f53f911fc7 Automatic changelog generation for PR #35433 [ci skip] 2018-02-12 13:18:01 -08:00
Robustin
6a5c750fb5 Cult Update? Cult Update! (#35433)
* Cult Fixes and Tweaks

* Master prompt and spelling fix

* Couple small fixes
2018-02-12 16:17:58 -05:00
ShizCalev
48991b4117 fixes announcement system exploit 2018-02-12 15:32:08 -05:00
ACCount
6de835a629 Adds tool_behaviour support to crafting, door wires, surgeries and mech construction (#35384)
* Adds tool_behaviour support to construction datums (mech construction)

* Adds tool_behaviour support to wire datums

* Adds tool_behavior support to surgeries

* Adds tool_behavior support to crafting

* New proc, to be used for checking tool qualities in hands

* Improves tool quality support on wires
2018-02-12 20:52:11 +01:00
tgstation-server
c794d13393 Automatic changelog generation for PR #35528 [ci skip] 2018-02-12 10:49:54 -08:00
MoreRobustThanYou
31e16b601e Fix SCP-294 appearance (#35528)
* Add files via upload

* Add files via upload
2018-02-12 13:49:51 -05:00
Jordan Brown
c037731e5f Disables max errors on travis compile (#35550) 2018-02-12 13:48:01 -05:00
Jordan Brown
8d88b6a825 Tests give 3 GBP (#35551) 2018-02-12 13:47:42 -05:00
tgstation-server
f5081357de Automatic changelog generation for PR #35517 [ci skip] 2018-02-12 09:15:20 -08:00
Dax Dupont
0b718fa053 Cell chargers are now buildable and (upgradable!) machines. (#35517)
* Cell chargers are now buildable machines

* done
2018-02-12 12:15:18 -05:00
tgstation-server
d39d300671 Automatic changelog compile, [ci skip] 2018-02-12 15:30:04 +00:00
Jordan Brown
8cbbe65f13 Split up Revert/Removal 2018-02-12 09:21:19 -06:00
tgstation-server
aba49822d1 Automatic changelog generation for PR #35524 [ci skip] 2018-02-12 07:20:03 -08:00
Dax Dupont
fc03caa700 Fatshaming the AI, moving him two tiles upward when mass_recall() happens (#35524) 2018-02-12 17:19:59 +02:00
ACCount
c6e607dc17 Refactors use_sound and changes the way tools play sounds (#35521)
* Adds list support to usesound, ports drills to usesound

* Adds more tool sounds, changes usesound usage to play_tool_sound

* fix
2018-02-12 17:16:47 +02:00
vuonojenmustaturska
6389825e39 Merge pull request #35549 from KorPhaeron/golem
Removes old golem items
2018-02-12 17:08:18 +02:00
vuonojenmustaturska
89e7ad7601 Merge pull request #35558 from praisenarsie/patch-28
fulton pack not allowed on supply shuttle
2018-02-12 17:06:36 +02:00
tgstation-server
1f5bfd5144 Automatic changelog generation for PR #35541 [ci skip] 2018-02-12 07:02:32 -08:00
vuonojenmustaturska
e2b380b02e Merge pull request #35541 from 81Denton/chem-conflicts
Fixes lye/plastic/charcoal conflicts
2018-02-12 17:02:29 +02:00
tgstation-server
bf7b9c0338 Automatic changelog generation for PR #35566 [ci skip] 2018-02-12 07:01:16 -08:00
MoreRobustThanYou
aca0cd453a Urinal cakes can now be picked up again (#35566)
* Urinal cakes can now be picked up again

* Update watercloset.dm

* Update watercloset.dm

* Update watercloset.dm
2018-02-12 17:01:11 +02:00
tgstation-server
091034b187 Automatic changelog compile, [ci skip] 2018-02-12 00:01:21 +00:00
tgstation-server
5e3850f820 Automatic changelog compile, [ci skip] 2018-02-11 22:09:21 +00:00
Jordan Brown
f0b26dd87b Merge pull request #35518 from ShizCalev/ACCESS-FIXES-MK2
Actually fixes broken accesses
2018-02-11 16:47:48 -05:00
FrozenGuy5
18228acf2f fulton pack not allowed on supply shittle 2018-02-11 21:36:42 +00:00
Jordan Brown
47ed29cb5b Merge pull request #35514 from ShizCalev/ghost-role-syndi-access
Fixes wrong ID for syndicate ghost roles
2018-02-11 16:34:17 -05:00
AnturK
c3c9f4c668 Highlander antag datum (#35519)
* Highlander antag datum

* Forgot debug line

* Also this
2018-02-11 16:32:06 -05:00
tgstation-server
ac6c15a460 Automatic changelog generation for PR #35515 [ci skip] 2018-02-11 13:29:40 -08:00
MoreRobustThanYou
4268e48880 Makes urinal cakes more realistic (#35515)
* Add files via upload

* Makes urinal cakes blue

* Add files via upload

* Delete urinalcake_squish.png
2018-02-11 16:29:38 -05:00
tgstation-server
c69f797b63 Automatic changelog generation for PR #35417 [ci skip] 2018-02-11 13:25:40 -08:00
vuonojenmustaturska
9715ae359e The chef is also a cook (#35417)
* just a lowly, lowly cook

* come on, that's not striking an officer
2018-02-11 16:25:37 -05:00
Jordan Brown
882edc3eff Merge pull request #35555 from MrStonedOne/patch-479
Fix sql error in exp updates
2018-02-11 16:24:45 -05:00
ShizCalev
f11fa6be63 Fixes PDA virus runtime 2018-02-11 16:15:43 -05:00
Kyle Spier-Swenson
c9aa8d140d Fix sql error 2018-02-11 12:14:09 -08:00
Jordan Brown
85c5a20e75 Removes Map Merge 1 (#35511)
* Removes Map Merge 1

* Add Prepare Maps.bat to mapmerge2
2018-02-11 14:03:29 -05:00