18547 Commits

Author	SHA1	Message	Date
kevinz000	147c0d8852	Merge pull request #10680 from Ghommie/Ghommie-cit518 ... snowflake-friendly towels.	2020-01-24 16:15:27 -07:00
kevinz000	afe8e00bdf	Merge pull request #10677 from Ghommie/Ghommie-cit515 ... Fixes dead malf AIs being able to doomsday, plus a few ported updates.	2020-01-24 16:14:49 -07:00
kevinz000	ea9513864d	Merge pull request #10674 from Xantholne/lunar01 ... Culturally Appropriate Lunar Clothes	2020-01-24 16:14:32 -07:00
Ghom	d5daae98c7	Merge pull request #9905 from Trilbyspaceclone/glassware ... [Ready] Cargo MK III - Glassware Addtion	2020-01-24 18:46:25 +01:00
Ghom	f5d8e447eb	Merge pull request #10676 from Kraseo/virgohairs ... Reorganises/fixes virgo hairs	2020-01-24 16:39:10 +01:00
Ghom	9013c7aa9c	Merge pull request #10630 from Citadel-Station-13/kevinz000-patch-17 ... Nerfs cloning	2020-01-24 16:23:28 +01:00
kevinz000	f626322fbd	Merge pull request #10650 from Arturlang/patch-5 ... [READY]Adds cheap modular computers to the loadout	2020-01-24 00:32:57 -07:00
kevinz000	928a8ceea3	Merge pull request #10628 from Citadel-Station-13/Ghommie-patch-1 ... Quick rubber toolbox materials fix.	2020-01-24 00:26:22 -07:00
kevinz000	831ac91917	Merge pull request #10073 from Ghommie/Ghommie-cit435 ... Ports timestop and sepia extracts improvements/tweaks.	2020-01-24 00:25:53 -07:00
kevinz000	f8ec01676a	Merge pull request #10609 from Putnam3145/cold-blooded-buff ... Moved cold-blooded to negative, made it cost -2	2020-01-24 00:22:08 -07:00
kevinz000	7cd6490e86	Merge pull request #10526 from Seris02/bowmanupgrade ... allows headsets to be bowmanized and adds a traitor item for that	2020-01-24 00:21:34 -07:00
kevinz000	07277436ac	Merge pull request #10665 from Ghommie/Ghommie-cit513 ... Fixes chainsaw force being set to 0 on drop.	2020-01-24 00:20:26 -07:00
kevinz000	6ffdc1642b	Merge pull request #10632 from Commandersand/nerd ... buffs some wiz spell cooldonws and changes some incantation phrases	2020-01-24 00:18:41 -07:00
kevinz000	2a706ceb05	Merge pull request #10664 from kappa-sama/patch-17 ... makes cursed dragnet take 5 seconds instead of 30 to break out of	2020-01-24 00:18:05 -07:00
loginsandylogout	a7a3a3a417	Update code/modules/spells/spell_types/lightning.dm ... po Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>	2020-01-23 22:52:18 -06:00
Seris02	90c7149d8c	merge conflict fixes	2020-01-24 10:27:48 +08:00
Ghommie	7d5725e450	a dot	2020-01-24 02:31:46 +01:00
Ghommie	78934c52fe	A handful of runtime fixes.	2020-01-24 02:27:06 +01:00
Ghommie	c8bf148216	snowflake-friendly towels.	2020-01-24 00:06:07 +01:00
Trilbyspaceclone	9466b0f4ca	Merge branch 'master' into glassware	2020-01-23 13:31:04 -05:00
Ghom	14a33ee7dc	Merge pull request #10651 from r4d6/Soft-rad-suit ... Make the radiation hardsuit a voidsuit instead	2020-01-23 19:23:09 +01:00
Ghommie	292aaa58dc	Fixes dead malf AI doomsday, a few ported updates.	2020-01-23 17:36:23 +01:00
Kraseo	14b7711590	i will end whoever ported virgo hairs and thought it was fine to do it like that	2020-01-23 17:29:21 +01:00
Ghom	21867f60dd	Merge pull request #10598 from Putnam3145/metabolic-synth-tweak ... Made metabolic synthesis nanites stop if not fed	2020-01-23 16:38:39 +01:00
Ghom	86a3a5dd4d	Merge pull request #10610 from Owai-Seek/bountytweaks ... Some Bounty Tweaks	2020-01-23 15:44:00 +01:00
Ghom	f3b9b20e57	Merge pull request #10672 from BlackMajor/master ... Fixes a donor sprite.	2020-01-23 15:30:29 +01:00
Unknown	bd8ce9a7b6	Culturally Appropriate Lunar Clothes	2020-01-23 06:35:50 -07:00
BlackMajor	77e7dff11b	Webedit PR man bad	2020-01-24 01:41:40 +13:00
Winter Flare	3d85499919	Requested Changes + Nerf ... Nerf cannabis bounties, comment out monkey cube bounty, change to shady jims.	2020-01-23 07:20:22 -05:00
BlackMajor	5fb2e60ebf	Merge branch 'master' into master	2020-01-24 00:50:46 +13:00
kevinz000	83591f8883	Merge pull request #10620 from Hatterhat/patch-1 ... exo suit nerf - melee and bomb armor	2020-01-23 04:48:06 -07:00
kevinz000	4304a7dd42	Merge pull request #10602 from Ghommie/Ghommie-cit509 ... RPD ventcrawler escapism sanity check.	2020-01-23 04:47:46 -07:00
kevinz000	aa19c2a17b	Merge pull request #10603 from Ghommie/Ghommie-cit510 ... clockwork cuirass now compatible with snakes. The original author was too lazy.	2020-01-23 04:47:18 -07:00
kevinz000	1b7265d8c1	Merge pull request #10605 from r4d6/Layer ... Port TG Layers updates and Freezer update	2020-01-23 04:46:52 -07:00
BlackMajor	7733d3f98a	Update robot_modules.dm	2020-01-24 00:42:41 +13:00
kevinz000	88f625edfc	Merge pull request #10636 from Ghommie/Ghommie-cit512 ... Trilby's solar panels PR but improved.	2020-01-23 04:35:13 -07:00
kevinz000	a01d7260d8	Merge pull request #10641 from jakeramsay007/Calibers-101 ... Revolver caliber changes; .357 revolvers can now also load .38 but not vice-versa.	2020-01-23 04:34:24 -07:00
TrilbySpaceClone	86ea13afeb	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into patch-270	2020-01-22 23:00:54 -05:00
Ghom	bf62563507	Merge pull request #10410 from CameronWoof/free-the-lizard ... Humans and anthromorphs can now use lizard tails.	2020-01-23 03:06:52 +01:00
Ghom	047059617c	Merge pull request #10645 from r4d6/Modular-Lavaland ... Modularize the mining base	2020-01-23 02:53:34 +01:00
Ghom	3ce27d6c36	Merge pull request #10638 from Hatterhat/patch-3 ... compact defibs have a properly set departmental flag now	2020-01-23 02:51:17 +01:00
Ghom	04811c9c22	Merge pull request #10450 from Citadel-Station-13/kevinz000-patch-8 ... (is this really a good idea) hitscan emitters	2020-01-23 02:44:17 +01:00
Ghom	fcbc5149c4	Merge pull request #10606 from r4d6/patch-2 ... Update the Passive Vents that I added	2020-01-23 02:40:54 +01:00
Ghommie	b0da18e404	Fixes chainsaw force being set to 0 on unwield.	2020-01-23 02:13:55 +01:00
kappa-sama	c8cfd4e150	cursed	2020-01-22 16:52:28 -05:00
r4d6	c78944c5bc	Update	2020-01-22 13:47:57 -05:00
r4d6	869e31b27b	Removing useless code	2020-01-22 13:17:47 -05:00
r4d6	96c0a86b5f	Make the Radiation Hardsuit a Voidsuit instead	2020-01-22 13:17:29 -05:00
Arturlang	0a545da35d	Webedit galore	2020-01-22 18:12:26 +01:00
Arturlang	e025c8a743	Oh right its a typo	2020-01-22 18:11:37 +01:00