26405 Commits

Author	SHA1	Message	Date
Lin	f724554059	Merge pull request #13964 from Citadel-Station-13/silicons-patch-2 ... fixes parrying working while otherwise paralyzed	2021-01-05 16:48:20 +00:00
silicons	cfc560ed3d	Merge pull request #13856 from Putnam3145/harness-tweak-2 ... Actually made gear harness properly adjustable	2021-01-05 02:52:41 -07:00
silicons	c937021b68	Update living_active_parry.dm	2021-01-04 03:17:51 -07:00
silicons	d6d753e9f7	Merge pull request #13959 from necromanceranne/bokken_fixes ... Bokken Fixes: You can make them now. Nyoops.	2021-01-03 21:37:33 -07:00
necromanceranne	0fda694a52	A bunch of fixes for bokkens, renamed all references to 'ironwood' to 'steelwood', since I got confused.	2021-01-04 15:30:28 +11:00
silicons	a0d58cd18d	Merge pull request #13954 from EmeraldSundisk/coglocks ... Cog and firelocks.	2021-01-03 20:19:46 -07:00
silicons	4c6cc24343	Merge pull request #13948 from necromanceranne/sheath_stuff ... Bokken and Bokken Accessories: Bonkvengeance	2021-01-03 18:18:29 -07:00
silicons	3897463f0b	Merge pull request #13955 from Chiirno/NightmareLightsout ... Nightmare Lights Damage Buff	2021-01-03 18:15:00 -07:00
silicons	7357ae3bc0	Merge pull request #13951 from BlueWildrose/CompensatingForSomething ... Max groin cannon size increased before being punished for erecting a massive mayo-blaster to -max roundstart config- inches instead of 20	2021-01-03 18:13:50 -07:00
silicons	8dfbf3eb87	Merge pull request #13947 from Chiirno/ChemmasterOutputFix ... Chemmaster output buff	2021-01-03 18:12:57 -07:00
silicons	092e7569c2	Merge pull request #13932 from shellspeed1/Ports-xeno-QOL-stuff ... Ports xenomorph plasma usage in power description from bee	2021-01-03 18:11:18 -07:00
silicons	ccbfd4015e	Merge pull request #13934 from shellspeed1/Ports-Navigation-Gigabeacon ... Ports bluespace navigation gigabeacon from TG	2021-01-03 18:11:10 -07:00
silicons	b164d6e75b	Merge pull request #13936 from BlueWildrose/hoodyhoodu ... Fixes loadout specific polychromic hoodies not having their hoods polychromable	2021-01-03 18:10:44 -07:00
silicons	c3e4eed5c7	Merge pull request #13938 from timothyteakettle/funny-synths ... anthromorphic synth species	2021-01-03 18:10:06 -07:00
silicons	c947dfdca5	Merge pull request #13940 from Chiirno/CargoParamedSuit ... Paramedic EVA suit now purchasable from Cargo	2021-01-03 18:09:59 -07:00
silicons	2641332fb2	Merge pull request #13941 from Chiirno/ChemMixerHotfix ... Portable Chem Mixer now added to the Biological Technology tech node.	2021-01-03 18:09:50 -07:00
silicons	0581748282	Merge pull request #13942 from YakumoChen/power-sink ... #13925 but doesn't underestimate engineering autism	2021-01-03 18:09:38 -07:00
silicons	89913ebc18	Merge pull request #13943 from Hatterhat/imagine-modularizing ... utility uniform typos and making the capdrobe not suck	2021-01-03 18:09:20 -07:00
silicons	d6bd5d4bac	Merge pull request #13945 from DeltaFire15/synth-organ-printing ... Makes IPC cells & power cords printable	2021-01-03 18:08:58 -07:00
silicons	0555756dde	Merge pull request #13946 from uomo91/logfix ... [Port] Fixes log collisions	2021-01-03 18:08:39 -07:00
silicons	697619856c	Merge pull request #13859 from timothyteakettle/unlockable-loadout-items ... unlockable loadout items	2021-01-03 18:07:18 -07:00
Chiirno	84d311e201	nightmare now oneshots glowshrooms, miner beacons, and console screens.	2021-01-03 02:44:47 -04:00
shellspeed1	c8ce23886c	Update code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm ... Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>	2021-01-02 22:10:36 -08:00
Putnam3145	f1b7c4aea5	Update miscellaneous.dm	2021-01-02 17:30:06 -08:00
Lin	b3c1c69861	Merge pull request #13944 from Citadel-Station-13/silicons-patch-59 ... fixes matrix labels on colormates (swapped 1 and 2, rg is actually gr)	2021-01-02 16:17:24 +00:00
Blue Wildrose	642c4a5806	erect up the config instead in case this situation comes up again.	2021-01-02 00:18:49 -07:00
EmeraldSundisk	291c0a0a22	Update Space_Station_13_areas.dm	2021-01-01 22:46:36 -08:00
Blue Wildrose	843b1494b3	max penis size increased before being punished for having one	2021-01-01 23:01:39 -07:00
Timothy Teakettle	dc44102d8b	fix	2021-01-01 22:39:16 +00:00
Timothy Teakettle	974f46cb22	attempt to fix	2021-01-01 22:36:35 +00:00
Timothy Teakettle	813e0f4c79	Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items	2021-01-01 22:30:04 +00:00
necromanceranne	6a247e2a68	Adds a new version of bokken, cleans up some unnecessary code, completely redoes several bokken related sprites	2021-01-02 04:26:39 +11:00
Chiirno	da5ea18c9a	OK, compiling did something funky to the dm code?	2021-01-01 04:04:39 -04:00
Chiirno	bbeed2b8f0	I've done it, I've edited TgUI!	2021-01-01 04:00:35 -04:00
DeltaFire	a2bb761bee	Merge pull request #13924 from SandPoot/master ... Allows mass sticking money into your id	2021-01-01 08:15:53 +01:00
DeltaFire	ee6601276d	Merge pull request #13935 from Citadel-Station-13/silicons-patch-58 ... fixes a bug	2021-01-01 08:11:40 +01:00
uomo91	6b0435e7b5	Port.	2021-01-01 00:46:47 -06:00
DeltaFire	2ed866d855	boom	2021-01-01 07:22:10 +01:00
silicons	fbb2cfbba1	Update colormate.dm	2020-12-31 23:05:14 -07:00
Hatterhat	e63e0ac9bd	something about wardrobes	2020-12-31 22:03:09 -06:00
YakumoChen	9325daa743	Update powersink.dm	2021-01-01 03:35:54 +00:00
DeltaFire	38565e0027	Merge pull request #13909 from silicons/twitch_plays ... Twitch Plays: Clown Car	2021-01-01 04:14:26 +01:00
Chiirno	218cac1a49	OK, chem mixer has been added to a tech node now.	2020-12-31 22:19:51 -04:00
Chiirno	6f5837d14f	changed the description of the crate.	2020-12-31 17:42:07 -04:00
Chiirno	d936b43e98	adjusted the price to 1975. Above eva suit at 1500 and beow medical hardsuit at 2750	2020-12-31 17:27:25 -04:00
Chiirno	7d0c4030c9	first commit, adding the paramed eva suit as an option for cargo.	2020-12-31 17:24:30 -04:00
silicons	1a027c2fa2	good catch	2020-12-31 13:34:47 -07:00
SandPoot	a0e95b7c3d	Update code/modules/mining/ores_coins.dm ... Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>	2020-12-31 16:59:33 -03:00
silicons	f1205efa0f	Merge pull request #13885 from raspy-on-osu/spaceheater-buff ... Makes space heaters worth using	2020-12-31 12:38:07 -07:00
Timothy Teakettle	3cde6799f7	define	2020-12-31 19:02:03 +00:00