12533 Commits

Author	SHA1	Message	Date
kevinz000	8b3d4c3da1	Update clock_cult.dm	2019-03-16 15:48:28 -07:00
kevinz000	83dbfc2987	Update cult.dm	2019-03-16 15:48:06 -07:00
kevinz000	696625f7b8	Update clock_cult.dm	2019-03-16 15:47:19 -07:00
kevinz000	4fea9d3a65	Update revolution.dm	2019-03-16 15:46:42 -07:00
Trilbyspaceclone	44d4c177e2	Merge branch 'master' into Pizza	2019-03-16 17:53:52 -04:00
Trilbyspaceclone	45a0fc856e	Update snacks_pizza.dm	2019-03-16 17:46:38 -04:00
Trilbyspaceclone	f88de367ed	Update recipes_pizza.dm	2019-03-16 13:26:45 -04:00
Trilbyspaceclone	9408fd8daf	Update recipes_pizza.dm	2019-03-16 12:58:49 -04:00
deathride58	9d711370d4	Fixes staminaloss not redirecting to the chest when attempting to apply to the head	2019-03-15 20:09:34 -04:00
deathride58	78472039cf	i hit ctrl s god fucking damnit	2019-03-15 19:47:02 -04:00
deathride58	4bc0833982	Makes conversions mute victims that are deciding their fate, fixes conversions requiring three cultists to sacrifice a refusing victim	2019-03-15 19:43:24 -04:00
deathride58	95c975078c	fixes travis	2019-03-15 19:22:28 -04:00
deathride58	36119e007d	Properly fixes igniters by increasing the max hotspot expose temperature of sparks to 700	2019-03-15 16:49:10 -04:00
deathride58	e4c5f005a0	makes DNR apply properly to ghost roles and midround antags	2019-03-15 16:26:17 -04:00
Ragolution	67f25f2721	Additional methods. ... Requested by nicc	2019-03-14 18:02:29 -04:00
Ragolution	12db99dc01	Update revival.dm ... Adds Abductor Science Tool to acceptable implements to revive a dead body.	2019-03-14 13:21:04 -04:00
kevinz000	86ddab31c4	Merge pull request #8107 from AmatsuDF/chillingbugfix ... Fixes a difference between /tg/ and Citadel that made extracts uninje…	2019-03-14 04:13:54 -07:00
Ragolution	b0ccfbc1b4	Revert "Merge pull request #8089 from Trilbyspaceclone/patch-70" ... This reverts commit 6ed81162b3, reversing changes made to 6aaee476c8.	2019-03-12 14:28:54 -04:00
kevinz000	98cdaf38cb	Merge pull request #8104 from Ghommie/Ghommie-cit9 ... Chemical Patches fix.	2019-03-12 00:30:24 -07:00
Amatsu Darkfyre	aedadb30a5	Fixes a difference between /tg/ and Citadel that made extracts uninjectable.	2019-03-10 23:54:45 -04:00
Trilbyspaceclone	ec030144d2	Update tiny_prick.dm	2019-03-10 17:03:45 -04:00
kevinz000	821a31afb8	Merge pull request #8090 from deathride58/tgpushes ... Replaces disarm right click action with tgstation/tgstation#42958's disarm pushes	2019-03-10 13:51:44 -07:00
kevinz000	b17b2a0a4a	Merge pull request #8097 from AmatsuDF/master ... Adds Chilling effects to Slime Crossbreeding	2019-03-10 13:50:37 -07:00
kevinz000	698adb7c7d	Merge pull request #8056 from deathride58/tegnerf ... Makes the efficiency of the TEG be dependant on how much gas is actively combusting in the hot pipe	2019-03-10 13:48:42 -07:00
kevinz000	d681b30df5	Merge pull request #8102 from Trilbyspaceclone/semi-auto ... Fixes ever case I can fine of WT-550 Auto Rifle being called Auto Rifle and not Semi-Auto - SMG	2019-03-10 13:44:57 -07:00
kevinz000	ac8636e127	Merge pull request #8084 from Poojawa/patch-4 ... Removes specific names from clone pod reports	2019-03-10 13:44:33 -07:00
kevinz000	4451d8e3ad	Merge pull request #8070 from deathride58/consensualcults ... Makes bloodcult conversions consensual, similar to Bay.	2019-03-10 13:44:20 -07:00
kevinz000	7628289ad6	Merge pull request #8091 from deathride58/fixesz1hyperspace ... Fixes centcom zlevel hyperspace acting like normal space (and also fixes the title screen while im at it)	2019-03-10 13:43:21 -07:00
kevinz000	0652c32c23	Merge pull request #8058 from deathride58/joggingslipresistance ... Makes jogging let you avoid water slips, but only if you have less than 20% staminaloss	2019-03-10 13:43:05 -07:00
kevinz000	b143f6f883	Merge pull request #8098 from Coolgat3/patch-2 ... Equalizes security helmet and beret armor	2019-03-10 13:42:44 -07:00
Amatsu Darkfyre	2d286e525d	Changes Adamantine Suit's armor values to not be bad. ... Also recolors the Slime Mask so it's more obvious at a glance what it is.	2019-03-10 15:10:07 -04:00
Trilbyspaceclone	aafbbad2af	Update tiny_prick.dm	2019-03-10 13:33:56 -04:00
Trilbyspaceclone	8a3b7d29d3	Update tiny_prick.dm	2019-03-10 13:30:45 -04:00
Ghommie	27efffb74c	1	2019-03-10 15:28:05 +01:00
Trilbyspaceclone	5197c0fb94	Update weapon_designs.dm	2019-03-09 20:34:39 -05:00
Trilbyspaceclone	8b99ca8094	Update packs.dm	2019-03-09 20:31:00 -05:00
Trilbyspaceclone	5aa5f1ed56	SMG	2019-03-09 20:29:19 -05:00
Trilbyspaceclone	ce7c76e8a4	?	2019-03-09 20:12:44 -05:00
Trilbyspaceclone	8f9542bc43	Update automatic.dm	2019-03-09 20:05:07 -05:00
Trilbyspaceclone	beb812e291	Update packs.dm	2019-03-09 20:03:40 -05:00
Trilbyspaceclone	979f9125ef	Update weapon_designs.dm	2019-03-09 19:54:48 -05:00
Coolgat3	45a4693618	Update helmet.dm	2019-03-09 16:42:27 +01:00
Coolgat3	eb786cbfde	Update jobs.dm	2019-03-09 16:39:51 +01:00
deathride58	5e6395270b	Merge pull request #7889 from Citadel-Station-13/kevinz000-patch-7 ... Reworks meth	2019-03-08 21:05:20 -05:00
Ghom	e80b17e572	Update code/modules/food_and_drinks/food/snacks_meat.dm ... Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>	2019-03-08 20:55:41 -05:00
deathride58	d9df0c1f76	Merge pull request #8093 from Trilbyspaceclone/patch-74 ... [Ready] Makes Fire extinguisher slip need a screwdriver - Frack & Spensara Request Middle ground by Bhijn	2019-03-08 20:54:21 -05:00
deathride58	c2acda5a96	Merge pull request #8073 from Citadel-Station-13/kevinz000-patch-27 ... bunker bypass now sanitizes ckeys automatically to avoid errors	2019-03-08 20:51:15 -05:00
deathride58	2ae75ccd21	Merge pull request #8078 from Citadel-Station-13/kevinz000-patch-29 ... Fixes SDQL2 list association recursing/printing	2019-03-08 20:50:50 -05:00
deathride58	e5f5520393	Merge pull request #8075 from BlackMajor/master ... More borg sprites	2019-03-08 20:50:33 -05:00
deathride58	aac192752f	Merge pull request #8088 from Trilbyspaceclone/patch-69 ... [MIRROR] - Candle cleanup and fixes #42968	2019-03-08 20:50:13 -05:00