Commit Graph

501 Commits

Author SHA1 Message Date
tkdrg e1c2f70ca3 Merge pull request #15812 from Shadowlight213/secborgremoval
Adds a config option to disable the security cyborg module.
2016-03-04 20:54:57 -03:00
AnturK ae9e56d21f Merge pull request #15852 from KazeEspada/Cabin
Cabin Away Mission
2016-03-03 22:18:12 +01:00
KorPhaeron 2bb41cd5b3 Merge remote-tracking branch 'refs/remotes/tgstation/master' into control_wand
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
2016-03-01 19:18:29 -06:00
KazeEspada 7bfe258241 Cabin ready for testing commit. Cabin is mostly finished and just needs some eyes to look over it and see if I missed anything. 2016-02-29 22:47:38 -07:00
KazeEspada f1d903dadb Add fireplace and a map generator. Finishes more the cabin map. 2016-02-28 14:18:08 -07:00
Shadowlight213 70d6dee73d Adds a config option to disable the security cyborg module. 2016-02-27 22:09:16 -08:00
KorPhaeron d217b48ab3 Config does not work for spawning things in lockers 2016-02-22 15:42:07 -06:00
KorPhaeron b278741b19 Door remote config 2016-02-22 14:58:05 -06:00
Cheridan 309bfa0e91 Merge pull request #15418 from MMMiracles/spaceman
Adds several templates for space ruins
2016-02-18 01:30:13 -06:00
Cheridan 5f089e6ac1 Merge pull request #15483 from ChangelingRain/blobtweaking
Blobs can now expand onto lattices and catwalks
2016-02-13 19:58:09 -06:00
tkdrg a550b9af9b Merge pull request #15461 from Fox-McCloud/bomb-config
Changes Bomb Config to Match Live Server
2016-02-13 13:35:05 -03:00
Nerd Lord 18bbc4758a Blob Sorium and Dark Matter properly reduce range based on bio protection.
Updates blob tips.
Blobs now consume walls that are on their tile.
Added a space between blob follow link and message.
2016-02-12 20:07:44 -05:00
Fox-McCloud c321086b4d Changes Bomb Config to Match Live Server 2016-02-12 05:49:38 -05:00
MMMiracles e10fe56f6c adds 11 templates for space ruins 2016-02-10 21:32:40 -05:00
francinum b03b54fc6c Removes outdated tip.
Gas tanks now start at 16kPa.
2016-02-10 20:56:06 -05:00
Bjorn Neergaard e3bd22b481 Stub regex.Replace, re-implement SQL note conversion 2016-02-04 17:19:46 -06:00
Bjorn Neergaard 063dd9fb84 Get the code running on 510
* Travis for 510
* Remove json, list2text, text2list, bygex
* Change blind and click catcher to a low plane
2016-02-04 17:19:40 -06:00
Shadowlight213 f4ec22f405 Makes the roundstart intercept report a config option. 2016-01-31 18:24:34 -08:00
KorPhaeron 7ec9231638 Removes disc 2016-01-30 00:12:52 -06:00
WJohn 718b4e2515 Adds the map to the maps.txt so downstream servers have it on map rotation. 2016-01-29 17:25:09 -05:00
AnturK 53f904389e Baked Assets 2016-01-24 12:53:59 +01:00
securitycopper 4ec39f5408 BugFix9906: Changed heater cooler logic to have power usage be based on change in current tempature and not change off of T20C 2016-01-14 21:44:48 -05:00
MMMiracles 2be090aee1 Merge branch 'master' of https://github.com/tgstation/-tg-station into geneticsishard 2016-01-01 15:03:45 -05:00
tkdrg 7090e124dd Merge pull request #13802 from KorPhaeron/random_ruin
Random ruins for space/lavaland [ready for review]
2015-12-28 18:40:13 -03:00
Lularian 32ca87bc9c lets hope 2015-12-27 22:01:22 -06:00
Lularian f880b3edb5 fire in the hole 2015-12-26 13:23:59 -06:00
markressler 1534406d92 added new medicine reagent, haloperidol. 2015-12-26 05:31:46 -03:00
MMMiracles 1c1e892ddf New Away Mission: Research Facility 2015-12-22 17:34:04 -05:00
KorPhaeron 5201b77495 Random Ruins 2015-12-19 06:55:50 -06:00
KorPhaeron 39c9067e94 Removes space hotel 2015-12-18 03:26:09 -06:00
MMMiracles f8ab62e92e finalization of the topside part, time to make dungeon designs woo 2015-12-06 01:13:17 -05:00
as334 611fb49c1c Wake me up inside 2015-11-29 00:58:30 -05:00
Cheridan 260f1b5f72 Merge pull request #13247 from MrStonedOne/patch-72
Adds tip about being able to make a windoor stay open by clicking it open rather than bumping it open
2015-11-28 16:49:11 -06:00
Bjorn Neergaard 5f108eef4e Merge remote-tracking branch 'tgstation/master' into nanoui_update 2015-11-27 15:31:35 -05:00
as334 ce9ea0ca46 FUCK THIS FUCK EVERYTHING 2015-11-26 22:22:07 -05:00
Kyle Spier-Swenson 6aec7e81ff Update tips.txt 2015-11-26 13:57:10 -08:00
Kyle Spier-Swenson 92adc2f996 windoor tip 2015-11-26 13:53:45 -08:00
Nerd Lord dadfad5235 tbh it makes more sense like this 2015-11-26 10:15:04 -05:00
Nerd Lord a1e74ef1ba Fixes revenant blight not resetting mutantrace colors properly.
Also updates revenant tips.
2015-11-26 10:04:43 -05:00
Bjorn Neergaard 4e5edf396a Update NanoUI
* Update NanoUI to the latest version, ported from Baystation12
* Update the Air Alarm UI
* Make changes to subsystems and some machines to make the new NanoUI
work
2015-11-26 07:11:27 -05:00
Aranclanos e68a5b773a Merge pull request #13173 from swankcookie/SuperMatter_Sword_fix
Supermatter Sword no longer gets bloody
2015-11-26 08:33:56 -03:00
Cheridan 2f74ef5144 Merge pull request #13058 from bgobandit/updatedtips
Updates outdated tips and adds some new tips for new features.
2015-11-25 01:06:30 -06:00
as334 63b599519d unfucking shit ass plasma memes part HOPEFULLY LAST ONE 2015-11-24 22:31:54 -05:00
swankcookie 776b5f3c4a admin change 2015-11-23 17:42:09 -06:00
Aranclanos 0f1945bef6 Merge pull request #13051 from kingofkosmos/enableidtopdaonfloor
ID into PDA without PDA in your inventory and a few other similar things
2015-11-23 20:27:07 -03:00
bgobandit 3753f93aec more tip fuckery 2015-11-22 06:38:30 -05:00
Lzimann 2733a01cef Fixed admins.txt 2015-11-18 16:20:28 -02:00
bgobandit 6b4c46594b update honk 2015-11-18 11:21:17 -05:00
as334 c98a7a0d7e Fixes merge conflicts, also a minor slipup with flags 2015-11-17 20:59:43 -05:00
as334 160506b401 Unfucking shit ass plasma memes part 2 2015-11-17 20:38:56 -05:00