Commit Graph

287 Commits

Author SHA1 Message Date
ZomgPonies 71b2c1621a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into limb
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2015-03-25 15:16:51 -04:00
ZomgPonies 6770819ae8 Limb overhaul first comit 2015-03-24 08:38:33 -04:00
Artorp fc45243f8a Bugfixes
- Disables random events by default, requires config.txt to enable
random events
- Makes portable turrets respect its preset anchored value
- Gives flamethrower a real category
2015-03-21 13:39:00 +01:00
Fox-McCloud 38adfe06a0 Removes Recursive Explosions 2015-03-19 03:23:14 -04:00
Fox-McCloud 604b4bb28a Escape Pod Fixes 2015-03-16 02:18:35 -04:00
Markolie 6352d2abd9 Remove qdel from ghost images, clarify qdel debug, nanoUI runtime fix 2015-03-04 15:09:12 +01:00
Markolie bbcc9e63ce Disable inactivity kick 2015-03-01 00:30:55 +01:00
ZomgPonies 710d60abda GC fixes 2015-02-25 10:58:56 -05:00
Mark van Alphen 534c178c03 Rename Shuttle.dm to shuttle.dm
Changing name directly in Github so it sticks.
2015-02-24 18:52:03 +01:00
Mark van Alphen ae04cce220 Merge pull request #397 from ZomgPonies/garbage
vg Garbage Collector
2015-02-24 18:28:45 +01:00
Markolie 3f51486ba4 Bug fixes, bot proces controller update 2015-02-24 01:40:43 +01:00
ZomgPonies 5c14d9c5f2 vg Garbage Collector 2015-02-23 17:18:38 -05:00
ZomgPonies 58612b62fe Adding event and bot controllers 2015-02-23 13:38:58 -05:00
ZomgPonies 3c0d278a91 Scheduler fixes and additions 2015-02-23 10:35:25 -05:00
ZomgPonies 2c50a42ba7 Goon process scheduler 2015-02-22 15:24:46 -05:00
Markolie efb45ea228 Table crafting refactor 2015-02-22 01:50:57 +01:00
Markolie c89e3ac1eb Revert "Revert "Emergency communications hotfix""
This reverts commit 3ea36839a8.
2015-02-20 17:59:07 +01:00
Markolie d8d1670b68 Revert "Revert "Saycode/language/species port from Bay""
This reverts commit d54579850c.

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-02-20 17:46:35 +01:00
ZomgPonies d54579850c Revert "Saycode/language/species port from Bay" 2015-02-19 20:15:42 -05:00
Mark van Alphen 3ea36839a8 Revert "Emergency communications hotfix" 2015-02-20 01:58:54 +01:00
Markolie ccea2ce151 Emergency communications hotfix 2015-02-20 01:47:32 +01:00
Markolie 46c53be6f1 Part 2 of saycode/language/species port from Bay. Also includes bugfixes. 2015-02-20 00:50:28 +01:00
Markolie 21926c9e48 Part 1 of saycode/language/species port from Bay 2015-02-17 23:20:50 +01:00
Markolie 6a2f3f8c84 Fix config oversight 2015-02-16 20:38:24 +01:00
Markolie 8726bad5b0 Z-level check refactor 2015-02-16 20:33:28 +01:00
Markolie ad167dc541 Announcement system overhaul, crew monitor system overhaul, add portable crew monitor 2015-02-16 19:03:29 +01:00
ZomgPonies 7cf86e2cfe Fixes light going through walls. 2015-02-12 01:23:16 -05:00
Markolie 86dd7782d5 Add cyborg latejoining 2015-02-05 14:27:39 +01:00
Markolie 2a1e9931a6 Add shuttle stranding 2015-02-01 16:05:43 +01:00
Markolie c520856716 Additional jobban options, minimum account age for antags 2015-01-31 19:48:48 +01:00
Bone White 30109587ed Singularity re-start fixes
1) Fixes an exception which prevented singularity generators from
spawning a singularity if they had fingerprints on them
2) Fixes an exception which was called on machineryprocess on the
deleted singularity generator

NOTES

For some obscure reason, hidden fingerprint logging on machinery does
not create a list if there is only one entry.  I couldn't find why, so I
wrote code to account for either a string or list for the singularity
generator ONLY.
2015-01-28 03:57:39 +00:00
Markolie 09321d6c0b Use station_name proc where possible, mapfix 2015-01-21 23:37:05 +01:00
Markolie 956f2ba703 Event overhaul from Bay, atmos fixes 2015-01-21 23:05:59 +01:00
Markolie fb7fc04f51 Shuttle fixes 2015-01-17 02:33:19 +01:00
Markolie e59a94a8a1 Constructable newscaster, labor camp overhaul, other fixes 2015-01-16 21:50:33 +01:00
Markolie ced499edc3 Vox Heist port from Bay 2015-01-10 06:21:21 +01:00
Markolie c70a6c172b Away mission port from /tg/ 2015-01-09 00:12:16 +01:00
Markolie e31886016b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/objects/structures/window.dm
2014-12-13 02:15:05 +01:00
Markolie 37b86cd8f1 Xenos gamemode rework 2014-12-13 02:08:22 +01:00
Fox-McCloud e76c8f26f3 Stamina 2014-12-12 06:52:20 -05:00
Markolie b21575f088 Bot port from /tg/ 2014-12-02 17:59:40 +01:00
melandor0 7ff72c38cd nanotrasen.se
Replaces 80.244.78.90 with nanotrasen.se in the code.
2014-09-04 19:45:43 +02:00
Jeremy Liberman a4196cb745 Add Vox Heist directive and call shuttle on completion of Directive X
Conflicts:
	baystation12.dme
	code/controllers/emergency_shuttle_controller.dm
	code/modules/mob/mob.dm
2014-08-06 23:12:24 +02:00
ZomgPonies b33df4745c Removed deprecated power generation stuff (AM, RUST) to free up more procs 2014-07-25 11:33:37 -04:00
Zuhayr ebb9f724aa Hydroponics rewrite, details will be in PR. Big commit.
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/game/gamemodes/events/spacevines.dm
	code/game/machinery/seed_extractor.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/mob.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/food/snacks/grown.dm
	icons/obj/hydroponics.dmi
	maps/tgstation2.dmm
2014-07-25 11:10:01 -04:00
mwerezak be23f29297 Fixes SpecOps shuttle having wrong initial tag set 2014-07-19 20:43:45 -04:00
Neerti 47ded176f2 Changes the wiki proc to accept player input to reach a specific page, or search for one if the wiki can't find it.
You can use it by typing 'wiki [query]' in the command box, for example 'wiki cult' brings up the cult guide, or clicking the wiki button at the top-right and typing what you want to look for.
It uses wikiurl, so other servers should be compilable, if they change their wikiurl.

Conflicts:
	interface/interface.dm
2014-07-19 10:57:57 -04:00
ZomgPonies 12b228b799 Did those mech changes I wanted to do a while ago, reverted gamma armory to old behavior. 2014-07-17 16:50:55 -04:00
mwerezak db521949fb Fixes gamma shuttle location not set at roundstart 2014-07-17 11:01:49 -04:00
mwerezak 7823403456 Updates docking controllers
Fixed centcom and admin shuttles missing centcom side docking
controllers. Adds prison and gamma shuttle docking controllers. Adds
escape shuttle docking controllers. Adds escape pod docking controllers.
2014-07-17 00:33:49 -04:00