150 Commits

Author	SHA1	Message	Date
LetterJay	ac5503d338	Merge branch 'master' into upstream-merge-33055	2017-12-25 04:10:34 -06:00
Jordan Brown	82114e753d	Merge pull request #33704 from Fox-McCloud/arm-implant-fix ... Fixes Arm Implant EMP Effect	2017-12-21 00:43:22 -06:00
deathride58	b2187123fb	Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405 ... [MIRROR] [Ready]Brain Trauma additions	2017-12-21 03:42:38 +00:00
XDTM	3af0aa2489	[Ready Again]Refactors disabilities into lists, allowing for independent disability sources	2017-12-18 15:19:53 -06:00
XDTM	962f135957	[Ready]Brain Trauma additions	2017-12-17 11:11:10 -06:00
Emmett Gaines	f875d4e176	Defines math, take 2	2017-12-17 10:02:43 -06:00
LetterJay	7af461539f	Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"	2017-12-16 13:08:50 -06:00
kevinz000	253c819bc1	TG Sync 12/15/17 ... s s	2017-12-15 06:27:57 -08:00
vuonojenmustaturska	7f90427a40	Replaces a bunch of loc assignments with forcemoves and moves to nullspace	2017-12-13 13:56:57 -06:00
CitadelStationBot	cc0b768c72	[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) ... * [READY] RND TECHWEBS + DEPARTMENTAL LATHES * resetting all the maps because we can worry about them later. * Regexing * I'm fucked * Fixes * . * maps * bleh * ree * fixes	2017-12-11 16:36:38 -08:00
deathride58	7179547be4	Merge branch 'master' into upstream-merge-31727	2017-12-10 21:51:51 +00:00
Jordan Brown	7a90baa1f8	Merge pull request #33390 from duncathan/atmos-defines ... cleans up atmos defines	2017-12-09 15:53:34 -06:00
XDTM	988dbe87da	Brain Traumas	2017-12-06 12:05:20 -06:00
LetterJay	eba36e48f9	Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188 ... [MIRROR] JSON feedback	2017-11-22 18:42:34 -06:00
deathride58	0f9a85e4d7	Merge pull request #3747 from Citadel-Station-13/upstream-merge-32101 ... [MIRROR] Refactor of catpeople mutant organs	2017-11-21 21:16:31 +00:00
deathride58	c2b27ebfa4	merges #3837	2017-11-21 14:45:44 -05:00
deathride58	eeba86e27e	Merge branch 'master' into upstream-merge-32188	2017-11-18 05:31:42 +00:00
deathride58	9e78bcd8f9	Merge pull request #3971 from Citadel-Station-13/upstream-merge-32786 ... [MIRROR] Replaces a bunch of mob loops with hopefully better ones	2017-11-18 05:29:32 +00:00
Jordie	b7e99a7448	JSON feedback	2017-11-17 01:44:12 -06:00
vuonojenmustaturska	6ce69fb2c8	Replaces a bunch of mob loops with hopefully better ones	2017-11-16 16:09:15 -06:00
oranges	952fa2a0f2	Fix conflicts between helmet/mech HUDs and HUD glasses	2017-11-16 15:39:15 -06:00
deathride58	44a7e6cfea	Update ears.dm	2017-11-16 12:47:04 -05:00
ACCount	eb54055278	Refactor of catpeople mutant organs	2017-11-01 21:38:06 -05:00
nicbn	8aef4f3b57	Rename brown gas to nitryl (#32271)	2017-11-01 21:37:20 -05:00
LetterJay	0e553b26db	Merge branch 'master' into upstream-merge-31737	2017-10-28 02:20:25 -04:00
LetterJay	141de52658	Merge pull request #3641 from Citadel-Station-13/upstream-merge-30791 ... [MIRROR] Assmos part 1, #2	2017-10-27 02:47:56 -04:00
LetterJay	4fee09e236	Merge pull request #3613 from Citadel-Station-13/upstream-merge-32098 ... [MIRROR] Fixes a runtime on organ replacement	2017-10-27 02:16:47 -04:00
as334	eb4f6326d7	Assmos part 1, #2	2017-10-26 23:12:27 -05:00
ACCount	1c1f39d1d3	Fixes a runtime on organ replacement	2017-10-25 23:38:31 -05:00
Leo	1f83d3cbb7	Merge pull request #32071 from ShizCalev/heart-spam-fix ... Fixes heartbeat message spam	2017-10-25 18:55:24 -05:00
Jordan Brown	c51edc3bcd	Removes duplicate typecaches	2017-10-23 08:25:30 -05:00
Poojawa	62273a3867	Merge branch 'master' into upstream-merge-31737	2017-10-21 07:18:14 -05:00
CitadelStationBot	d25cb1ba5d	[MIRROR] Grammar fixes to atom descriptions (#3165) ... * Grammar fixes to atom descriptions * compile errors	2017-10-21 07:17:03 -05:00
CitadelStationBot	e827f02863	[MIRROR] Fixes various spelling and grammar errors. (#3436) ... * Fixes various spelling and grammar errors. * Update crashedship.dm * Update listeningstation.dm * Update augments_chest.dm * Update augments_chest.dm	2017-10-21 07:10:23 -05:00
Jordan Brown	f205911b5a	Adds defines for organ slots	2017-10-15 19:34:42 -05:00
kevinz000	b20e5916ea	Removes a bunch of sleeps/spawns and makes a few booleans defines	2017-10-14 18:53:48 -05:00
duncathan salt	c0e9cde5c2	Minor refactor of how gas IDs are handled	2017-10-12 00:30:09 -05:00
kevinz000	cee28e27fe	Fixes invalid arg runtime with drop_if_replaced (#31439) ... * Update augments_eyes.dm * Update eyes.dm	2017-10-09 19:05:18 -05:00
LetterJay	6cb68e06e3	Update autoimplanter.dm	2017-10-08 15:07:28 -05:00
LetterJay	86d9e5955a	Update autoimplanter.dm	2017-10-08 14:51:27 -05:00
Jordan Brown	075cb673c0	Remove drop_item, drop_item_v, put_in_hands_or_del	2017-10-07 12:37:06 -05:00
oranges	c22f4a044d	Merge pull request #31238 from AnturK/specialeyes ... Space vision fix V2.0 - GAME_PLANE change	2017-10-04 15:14:07 -05:00
AnturK	fd5acc5573	Organ initialization cleanup	2017-10-03 14:18:39 -05:00
ShizCalev	9da41c3596	Stops revheads from being metagamed with healthscanners & medical HUDs. (#31110) ... * Stops revheads metagaming * Added comment.	2017-09-28 22:00:16 -05:00
LetterJay	d8de375ada	Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969 ... [MIRROR] DisplayTimeText mk2	2017-09-27 23:39:03 -04:00
ShizCalev	169aa85d9c	DisplayTimeText mk2	2017-09-24 18:59:57 -05:00
pubby	34e186dadb	Datum abductors refactor	2017-09-24 18:00:49 -05:00
Robustin	e9534fb156	Fix: No more beating sounds from dead hearts (#30871) ... * Automatic changelog generation for PR #30056 [ci skip] * Delete AutoChangeLog-pr-30056.yml * Removes beating from nonbeating hearts * single check	2017-09-20 10:58:55 -05:00
CitadelStationBot	4bc6e9d522	[MIRROR] Cleaned up some decimal values. (#2797) ... * Cleaned up some decimal values. * Update gas_mixture.dm * Update color.dm * Update medsci.dm	2017-09-18 01:45:39 -05:00
LetterJay	c0a467c2fc	Merge pull request #2709 from Citadel-Station-13/upstream-merge-30415 ... [MIRROR] Nightmare	2017-09-12 23:31:38 -05:00