29990 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Yoshax	2f95f98ec1	Adjusts secret game mode possibility formatting	2016-04-04 19:22:03 +01:00
EmperorJon	3971b93731	Merge pull request #1347 from Neerti/4/4/2016_hugbox ... Removes Head Gibbing	2016-04-04 17:56:47 +01:00
Datraen	3e6c9f8110	Merge pull request #1318 from Neerti/3/31/2016_go_away_icarus ... Fixes Icarus reference, when mercs come to the colony with the cloak off	2016-04-04 11:27:55 -04:00
Datraen	eb0fe574b9	Merge pull request #1351 from Kelenius/changelog ... Updates changelog	2016-04-04 11:26:08 -04:00
Datraen	ca24446d7f	Merge pull request #1287 from Kelenius/unitTests ... Ports unit tests	2016-04-04 10:34:12 -04:00
EmperorJon	1e20f816ad	Merge pull request #1348 from Neerti/4/4/2016_lwap_nerf ... Laser Snipers no longer stun on hit.	2016-04-04 15:07:07 +01:00
EmperorJon	daf7c1065e	Merge pull request #1349 from Neerti/4/4/2016_communicator_fix ... Communicator Fix	2016-04-04 15:06:35 +01:00
Kelenius	9359d59dd8	Updates changelog	2016-04-04 13:53:06 +03:00
Neerti	5b47212f48	Communicator Fix ... Communicators now initialize properly, and are no longer invisible until the owner clicks the device in their hand for the first time in the round.	2016-04-04 05:17:07 -04:00
Kelenius	e06df420fc	Adds color to unit tests	2016-04-04 11:46:39 +03:00
Datraen	54627608e1	Adds a portables pump station to the station. ... * Adds a pump station to the station. * Adds a digital valve for switching between the canisters and the waste loop.	2016-04-04 04:12:35 -04:00
Neerti	53c16f02bb	Laser Snipers no longer stun on hit.	2016-04-04 04:02:52 -04:00
Neerti	8f1e878cb8	Adds variable to disallow gibbing of limbs, checked after the variable to disallow dismemberment. ... The head can no longer be gibbed. Severing the head via sharp weapons remains an option.	2016-04-04 03:42:46 -04:00
Neerti	4eff2f8d10	Merge pull request #1346 from EmperorJon/03_Apr._Jeans_colour_change ... Various changes to jeans	2016-04-03 19:27:47 -04:00
Jon	eb0efbf2ef	Adds grey jeans, jeans shorts, and jeans shorts (female). Kinda annoyed we have so many variants but that's for another day. ... The grey jeans are the black jeans sprite (which are grey...) The black jeans are now darker! But they still look different from black pants. The black shorts have had their side-sprites darkened so they look black, not grey, and match the front/back view better. The new grey variants keep those grey sides and have grey back and fronts too.	2016-04-04 00:07:50 +01:00
EmperorJon	b429c7b7e8	Merge pull request #1345 from Neerti/4/3/2016_fixes_cloaks_and_guns ... Firing a gun while cloaked will now unclock you.	2016-04-03 23:34:11 +01:00
Neerti	151082343b	Firing a gun while cloaked will now unclock you.	2016-04-03 18:20:07 -04:00
Neerti	adaa9f4adc	Merge pull request #1338 from Mark9013100/4/3/2016helmsprites ... Modifies the riot helm and generic space helmet sprites	2016-04-03 17:36:26 -04:00
Datraen	4db6b838b5	Merge pull request #1343 from EmperorJon/03_Apr._Oppressive_censorship ... Removes "Goebbles"	2016-04-03 15:33:38 -04:00
EmperorJon	bdede3c3fd	Merge pull request #1341 from Yoshax/lunchboxes ... Adds lunchboxes	2016-04-03 20:25:19 +01:00
Jon	445b880781	Removes "Goebbles" (despite it not actually being spelt correctly) from the last name list, on staff request.	2016-04-03 20:22:01 +01:00
Yoshax	36c1746f37	Adjusts lunchbox loadout cost	2016-04-03 20:21:19 +01:00
Yoshax	fc845d12af	Adds a missing comma	2016-04-03 17:31:51 +01:00
Yoshax	35d8092d98	Further cleans up pathing in file	2016-04-03 17:26:23 +01:00
Yoshax	a7e5116598	Adds lunchboxes	2016-04-03 17:12:01 +01:00
EmperorJon	a118265a4b	Merge pull request #1340 from Datraen/PreferenceVerbsPerms ... Toggles now save preferences when toggled.	2016-04-03 16:30:07 +01:00
Datraen	a2c4395bad	Toggles now save preferences when toggled.	2016-04-03 09:15:01 -04:00
Mark9013100	0b1373cc04	Modifies the riot helm and generic space helmet sprites	2016-04-03 08:06:10 -04:00
EmperorJon	04da34a08e	Merge pull request #1334 from Datraen/BetterMicrowave ... Replaces previous microwave hackfix with proper checks.	2016-04-02 23:50:07 +01:00
EmperorJon	b3f325c558	Merge pull request #1335 from Woodratt/1.4.9_hotfix2 ... 1.4.9 Hotfix	2016-04-02 23:49:45 +01:00
woodratt	1f3556316d	1.4.9 Hotfix ... - Phoron tank in atmos brought back into OSHA non-compliance - Extra table in the starboard aid station removed. - Missing air alarms in visitor rooms added. - Derelict shop area updated. - Manhack grenade fixed for heist. - Two of the three spike throwers removed. - Three new "hair" styles added for Teshari, fixed one broken one. - Toxins mixing chamber now starts airless. - Framework in place to allow for a custom item (white cane) - Fixed access restrictions on riot control maintenance door. - Firelock added to CE's office door. Entryway from the CE's office to the monitoring room added. - Fixed a camera in the detective's office. - Anchored the exonet node on T-comms. - Fixed Dufflebag in hand sprites.	2016-04-02 15:44:37 -07:00
Datraen	ae18758550	Replaces previous microwave hackfix with proper checks. ... Previously a second list was used, rather than a proper removal of the components_list. The procs were restricted rather than checking for if it was a machine and proceeding appropriately.	2016-04-02 18:39:34 -04:00
EmperorJon	593162fa41	Merge pull request #1331 from Datraen/GameModesRequirements ... Lowers requirements for the new game modes.	2016-04-02 21:43:28 +01:00
Datraen	39e5834692	Lowers requirements for the new game modes.	2016-04-02 15:13:54 -04:00
EmperorJon	1a1fd205e5	Merge pull request #1329 from Yoshax/revert-1322-cluwne ... Revert "Implements new role playing opportunities"	2016-04-02 18:43:58 +01:00
Yoshax	aa974b5597	Revert "Implements new role playing opportunities"	2016-04-02 18:32:41 +01:00
EmperorJon	128c237e8e	Merge pull request #1327 from Yoshax/revert-1323-mimes ... Revert "Mimes"	2016-04-02 18:32:18 +01:00
Yoshax	270b7d3b36	Revert "Mimes"	2016-04-02 15:40:19 +01:00
Neerti	e939e2dd98	Merge pull request #1323 from Yoshax/mimes ... Mimes	2016-04-01 19:07:40 -04:00
Yoshax	a6cae619f7	Corrects error	2016-04-02 00:00:23 +01:00
Yoshax	96aca20e41	Adds mimes and updates changelog	2016-04-01 23:59:58 +01:00
Neerti	6621a8948f	Merge pull request #1322 from Yoshax/cluwne ... Implements new role playing opportunities	2016-04-01 18:52:34 -04:00
Yoshax	393a4fad4d	Updates changelog	2016-04-01 23:47:36 +01:00
Yoshax	28621e8e59	Implements the prestigious job of clown	2016-04-01 23:40:43 +01:00
Neerti	c52978cd30	Merge pull request #1321 from serenemelody/master ... Tajaran sprite change -April Fool-	2016-04-01 17:43:19 -04:00
Datraen	459f70ba46	Merge pull request #1319 from Mark9013100/3/31/2016medweb ... Adds the medical webbing	2016-04-01 16:53:58 -04:00
Neerti	983192bf11	Merge pull request #1315 from Datraen/PrefVerbsPerms ... Updates Preference Permissions, Re-adds Verbs	2016-04-01 16:53:52 -04:00
serenemelody	cb62429927	Tajaran sprite change -April Fool- ... Changed the Taj female sprite. Adds catboobs.	2016-04-01 15:49:56 -05:00
EmperorJon	7930557e01	Merge pull request #1314 from Neerti/3/31/2016_research_borg_fix ... Fixes Research Module's Analyzer	2016-04-01 19:09:38 +01:00
EmperorJon	690b4013a1	Merge pull request #1320 from Mark9013100/4/1/2016mlgjanibuff ... Janitor Edits	2016-04-01 19:03:16 +01:00