1965 Commits

Author	SHA1	Message	Date
Ghommie	563a0fef3c	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit390	2019-12-13 02:45:53 +01:00
Ghommie	3fcb7808fd	args	2019-12-13 02:30:17 +01:00
Ghommie	8ec4bdaef5	Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.	2019-12-13 02:30:11 +01:00
BlackMajor	83a707ee93	Removes medihounds, same treatment as janihounds	2019-12-13 13:48:22 +13:00
Ghommie	4502d7b795	Ports improved and simplier fire alarms.	2019-12-12 22:44:20 +01:00
Lin	9ec8458803	Merge pull request #9983 from Ghommie/Ghommie-cit408 ... refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.	2019-12-10 23:52:31 +00:00
Jay	0670db4e63	initial push for a large request - DNM	2019-12-10 08:03:00 -06:00
Lin	78ed78ddbc	Merge pull request #10116 from Putnam3145/nolewd-fix ... Makes genital enlargement chems properly opt-outable	2019-12-10 02:31:44 +00:00
BlackMajor	8817f04e19	Merge pull request #9747 from Ghommie/Ghommie-cit329 ... Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.	2019-12-10 11:18:55 +13:00
Putnam3145	12003e8f59	Merge pull request #10130 from kappa-sama/patch-13 ... unmodularize hulk	2019-12-09 13:40:52 -08:00
Putnam3145	beddaa1a99	Merge pull request #10053 from Ghommie/Ghommie-cit429 ... Fixes some means of eyes blindness not working, removes legacy code.	2019-12-09 12:40:37 -08:00
kappa-sama	02d807f67c	begone thot	2019-12-09 10:11:17 -05:00
Ghommie	414d4b7a90	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408	2019-12-09 00:04:22 +01:00
Putnam	3e176bb79a	should interrupt always	2019-12-08 11:41:08 -08:00
Ghommie	7cc332960b	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329	2019-12-07 05:30:07 +01:00
Hatterhat	d1bfe3d840	i hate	2019-12-06 21:43:15 -06:00
Unknown	97e686cf23	Merge branch 'master' into xantholne-christmas01	2019-12-06 17:21:08 -07:00
Ghommie	723690bab0	Demodularize defib disks and projectiles icons.	2019-12-06 23:07:50 +01:00
Ghommie	542c9007ee	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265	2019-12-06 20:09:35 +01:00
kevinz000	b8bb0f2924	Merge pull request #10048 from Ghommie/Ghommie-cit426 ... Demodularize moodlets.	2019-12-05 21:56:29 -07:00
kevinz000	d217a9f445	Merge pull request #10032 from Ghommie/Ghommie-cit418 ... Porting some return type annotations and bad keyword fixes.	2019-12-05 21:33:12 -07:00
Ghommie	a944ea9db1	considering the gun holds 2 rounds at a time and we have odd amounts in the box, players may become upset about it in the future.	2019-12-06 05:07:34 +01:00
Ghommie	0e3774d73f	Spinfusor nerf, cause a 7k cost supply pack containing 32 explosive munitions that work just fine without the gun is just pure balance.	2019-12-06 04:47:33 +01:00
Ghommie	238655d599	Fixes eyes blindness a little.	2019-12-06 00:10:50 +01:00
Seris02	0c5a1b900b	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintercoattide	2019-12-05 21:09:38 +08:00
Ghommie	77ef3dabea	Demodularize moodlets.	2019-12-04 23:10:39 +01:00
Ghommie	3c7d2972de	Porting some return type annotations and bad keyword fixes, linter stuff.	2019-12-03 03:31:35 +01:00
Lin	99e9c7299e	Merge pull request #10004 from Ghommie/Ghommie-cit414 ... Unmodularizing first aid kits.	2019-12-03 01:30:51 +00:00
Putnam3145	8d09f5a082	Merge branch 'master' into tinytweaks	2019-12-01 23:24:56 -08:00
Putnam3145	8da17c5aaf	Merge pull request #9946 from Citadel-Station-13/kevinz000-patch-117 ... Removes hyperspeed from light pink stabilized for -4.5 stam/tick + free sprint	2019-12-01 23:12:35 -08:00
Putnam3145	1d91e1acf4	Merge pull request #10016 from deathride58/mousedropfixes ... Mousedrop fixes - Adds return value to item mousedrop and fixes bugs with the few things that override it	2019-11-30 22:51:42 -08:00
Putnam3145	fde3f52212	Merge pull request #10005 from Commandersand/loadoutcit ... Adds plaid skirt, pens, stripper outfits,athletic shorts to loadout. also keyhole sweater	2019-11-30 22:36:27 -08:00
Putnam3145	44c621e5e9	Merge pull request #9895 from Thalpy/OrganQoL ... [READY] Organ quality of life fixes. Adds Organ fridges with items, Tweaks scanner, new surgery, tweaks chems	2019-11-30 22:22:52 -08:00
Seris02	9afbabb55e	removes cult coat for now, adds coats to places	2019-12-01 05:42:43 +08:00
deathride58	b1fca2b74b	Mousedrop fixes - Adds return value to item mousedrop and fixes current bugs with the few things that make use of it	2019-11-29 22:59:37 -05:00
loginsandylogout	67754daf22	Fixed	2019-11-29 10:57:51 -06:00
loginsandylogout	7ddaaea267	Cats	2019-11-29 10:56:18 -06:00
loginsandylogout	88bd7678b1	Eee	2019-11-29 10:55:00 -06:00
loginsandylogout	a608003555	Equals	2019-11-29 10:53:57 -06:00
Putnam3145	ad53b10faa	Merge pull request #9964 from GrayRachnid/fixmyblunder ... Fixes Codewords not changing color and MkUltra enthrall not having the proper hearing_args	2019-11-29 06:20:18 -08:00
loginsandylogout	c8bc6941eb	"don't copy paste code"	2019-11-29 02:46:31 -06:00
loginsandylogout	0da35fdde5	again	2019-11-29 02:33:33 -06:00
loginsandylogout	f9d8c41c3e	newline needed apparently	2019-11-29 02:32:47 -06:00
Commandersand	2c2f3ea8aa	mandatory meme	2019-11-29 02:03:31 -06:00
Commandersand	60cee5814a	keyholesweater	2019-11-29 01:59:34 -06:00
Commandersand	22d0dbc05b	sundress and stripper	2019-11-29 01:56:47 -06:00
Commandersand	5b7bf08d10	sundress	2019-11-29 01:47:41 -06:00
Commandersand	b715c088f6	add athletic shorts to loadout	2019-11-29 01:27:15 -06:00
Commandersand	57af7ba8af	add plaid skirt,multipen,fountainpen to loadout	2019-11-29 01:24:24 -06:00
Unknown	233ca30cd6	Merge branch 'master' into xantholne-christmas01	2019-11-28 23:21:36 -07:00