15335 Commits

Author	SHA1	Message	Date
Ghommie	aa6860250b	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226	2019-10-15 20:40:07 +02:00
deathride58	9fd4e7f673	Merge pull request #9472 from Thalpy/Quickfixforfood ... [speedmerge] Quickfixforfood and fixes the chem hindenburg	2019-10-15 06:32:59 -04:00
deathride58	26d4a2d943	Merge pull request #9493 from Ghommie/Ghommie-cit234 ... SDGF ghost poll message made terse, other tweaks.	2019-10-15 06:27:58 -04:00
deathride58	df17f34eb6	Merge pull request #9488 from Ghommie/Ghommie-cit231 ... Adds some missing species_traits for cloth, clockwork and cult golems.	2019-10-15 06:20:43 -04:00
deathride58	ffa7898f45	Merge pull request #9478 from Putnam3145/podfatfix ... Makes pod people not constantly slightly fat	2019-10-15 06:19:26 -04:00
deathride58	c06c0b9574	Merge pull request #9492 from Ghommie/Ghommie-cit233 ... Resprites bedsheet bins in 3/4 perspective, adds towel bins subtype.	2019-10-15 06:16:17 -04:00
deathride58	6245d5df30	Merge pull request #9471 from Citadel-Station-13/exploits ... [s] fixes some exploits	2019-10-14 14:16:46 -04:00
Ghommie	321c30cf89	now with 51% more loads.	2019-10-14 06:24:54 +02:00
Ghommie	3671755142	My cat resting on my neck is just sooo warm, like a best scarf.	2019-10-14 06:06:25 +02:00
Ghommie	e969e89ce5	Well, byond quirks.	2019-10-14 03:09:15 +02:00
Ghommie	22fc7a9088	Resprites bedsheet bins in 3/4 perspective, adds towel bins subtype.	2019-10-14 02:32:23 +02:00
Ghommie	ff3972247a	Fixes some missing species_traits for cloth, clockwork and cult golems.	2019-10-13 23:40:52 +02:00
kevinz000	4c52b7a416	Merge pull request #9339 from Ghommie/Ghommie-cit205 ... Removes revenant blight's shabby tox damage in favor of negative mood effects, and necropolis curse if not cured	2019-10-13 14:00:52 -07:00
kevinz000	48e4187cef	Merge pull request #9461 from r4d6/master ... Adding Decorative Wings	2019-10-13 14:00:07 -07:00
kevinz000	1fda4deef7	Merge pull request #9465 from Trilbyspaceclone/patch-230 ... Update granters.dm	2019-10-13 13:58:03 -07:00
kevinz000	53858e1818	Merge pull request #9416 from Ghommie/Ghommie-cit215 ... The niche singularity beacon now also moderately buffs meteor waves.	2019-10-13 13:56:03 -07:00
kevinz000	3d9f012cdb	Merge pull request #9464 from JTGSZ/speciesrestrictions2 ... Re-adds latejoin menu qualifies for rank proc restrictions. Try number 2	2019-10-13 13:55:21 -07:00
kevinz000	064e6980f9	Merge pull request #9474 from Putnam3145/fix-nanites ... Makes neural nanite programs not drain nanites on things they can't fix	2019-10-13 13:55:05 -07:00
kevinz000	adeb33cdae	Merge pull request #9463 from Owai-Seek/minor-fixes ... Updating Kinkmate item-list	2019-10-13 13:54:26 -07:00
kevinz000	32b2d629e4	Merge pull request #9473 from PersianXerxes/stopCultSpareTPing ... Set clockcult teleport in Captain's Quarters to false.	2019-10-13 13:46:40 -07:00
Ghommie	c78078bdd4	typo	2019-10-13 06:08:53 +02:00
Ghommie	7b65343f45	z-level checks.	2019-10-13 06:04:57 +02:00
Putnam	1b97c50ef7	Makes pod people not constantly slightly fat	2019-10-12 17:50:51 -07:00
deathride58	0c8b82168d	Merge branch 'master' into Ghommie-cit222	2019-10-12 11:20:32 -04:00
Thalpy	3f16c287a9	I'm big silly	2019-10-12 13:40:40 +01:00
Thalpy	82446681bf	Everything is pain	2019-10-12 13:22:05 +01:00
Thalpy	d94f796ffb	aaaa	2019-10-12 12:42:51 +01:00
Putnam	7003080440	Merge branch 'master' into fix-nanites	2019-10-12 02:36:51 -07:00
Persi	db1f459151	Set clockcult teleport in Captain's Quarters to false.	2019-10-12 03:01:52 -04:00
Fermi	2a6b84151e	Removed something I didn't mean to	2019-10-12 07:59:44 +01:00
Putnam	c389099a47	Makes brain-healing nanites not work uselessly	2019-10-11 23:58:34 -07:00
Fermi	2e03985696	aaaa	2019-10-12 07:55:19 +01:00
Fermi	f922a3dda5	Fast!!	2019-10-12 07:18:39 +01:00
kevinz000	076b2d48fc	Update secbot.dm	2019-10-11 20:46:19 -07:00
kevinz000	8c07a79700	Update bot.dm	2019-10-11 20:45:42 -07:00
kevinz000	5cf627e889	Update computer.dm	2019-10-11 20:43:36 -07:00
kevinz000	f393c7fff2	Update new_player.dm	2019-10-11 20:43:10 -07:00
kevinz000	e600b59217	Update computer.dm	2019-10-11 20:42:01 -07:00
kevinz000	d33b866805	Merge pull request #9467 from deathride58/compscithree ... [s] fixes client analyzation having cid and ip swapped	2019-10-11 12:34:25 -07:00
deathride58	a2f5395b39	[s] fixes the client analyzation having cid and ip swapped	2019-10-11 15:16:35 -04:00
kevinz000	46994f2475	Merge pull request #9448 from MrJWhit/zombie-eyes ... Makes zombie smell through their eyes	2019-10-11 12:16:06 -07:00
kevinz000	b56563fcfe	Merge pull request #9374 from kappa-sama/walktime ... ashwalkers now have more messages telling them to not go on station	2019-10-11 12:13:49 -07:00
kevinz000	e717272129	Merge pull request #9450 from JTGSZ/offsets4stuff ... Adds more control over species based offsets	2019-10-11 12:13:19 -07:00
kevinz000	bcc92d234b	Merge pull request #9386 from Sishen1542/suitrad ... Gives suit storage units the ability to remove radiation from mobs	2019-10-11 12:13:04 -07:00
kevinz000	0643a7b230	Merge pull request #9387 from Sishen1542/goose ... the geese have been unleased	2019-10-11 12:11:50 -07:00
kevinz000	9120e4b7c8	Merge pull request #9399 from Arturlang/patch-1 ... [s] Adds a distance check to the supermatter tongs consume action, ported from TG	2019-10-11 12:10:53 -07:00
kevinz000	b0b274762c	Merge pull request #9441 from lolman360/whydowehave1000branches ... Ports /tg/ advanced surgerytools and tool defines.	2019-10-11 12:10:31 -07:00
kevinz000	9cd75c82a4	Merge pull request #9435 from Linzolle/firefix ... fix fireman carry offhand not automatically deleting itself	2019-10-11 12:09:14 -07:00
kevinz000	620af601b2	Merge pull request #9437 from JTGSZ/clothingrestrictions ... Optional Species based clothing restrictions	2019-10-11 12:08:57 -07:00
kevinz000	4ab08802a1	Merge pull request #9442 from YakumoChen/air-hog ... Reverts jetpack efficiency from #9307	2019-10-11 12:08:44 -07:00