17520 Commits

Author	SHA1	Message	Date
BlackMajor	30e3edaac1	Merge branch 'master' into Yeehaw	2020-01-02 22:03:58 +13:00
BlackMajor	3239acf74d	Sync	2020-01-02 22:02:55 +13:00
BlackMajor	8085022d97	Couple of changes. Starting on the point bank.	2019-12-31 23:28:30 +13:00
BlackMajor	c14a639f6e	crusher wasn't dealing damage whoops	2019-12-30 12:25:12 +13:00
BlackMajor	62b3c1e65b	Makes pick up range work	2019-12-30 02:28:23 +13:00
BlackMajor	8948e0491e	add mining card	2019-12-30 02:07:49 +13:00
BlackMajor	b811d3e57e	More work on it	2019-12-30 01:23:41 +13:00
BlackMajor	375e59a77d	Merge branch 'master' into Yeehaw	2019-12-29 22:12:40 +13:00
BlackMajor	2e03a529bf	checking off the list	2019-12-29 22:11:10 +13:00
BlackMajor	206a5e168a	More mining changes	2019-12-29 20:15:49 +13:00
kevinz000	96d9fed565	Merge pull request #10091 from Ghommie/Ghommie-cit442 ... Reduces the blue, amber and red alert sounds volume.	2019-12-28 18:08:33 -08:00
kevinz000	429aaaa342	Merge pull request #10318 from Trilbyspaceclone/patch-252 ... Allows AI/Sillicons to speak slime	2019-12-28 18:07:55 -08:00
Ghom	f68d7fa1a3	Merge pull request #10328 from Putnam3145/dynamic-ghost-tweaks ... Makes ghost cafe mobs actually a ghost role	2019-12-29 00:08:38 +01:00
Putnam	7947f06557	Made sure ghost cafe visitors don't get midround antags	2019-12-28 13:56:03 -08:00
Putnam	a0374f82e2	Made a line use the dang macro	2019-12-28 13:55:54 -08:00
Ghom	2ad4698225	Merge pull request #10217 from Putnam3145/radiation ... Nerfing radioactive contamination	2019-12-28 17:21:25 +01:00
Ghom	d2c1eb3e47	Merge pull request #10299 from kappa-sama/patch-13 ... sunflowers are no longer explosive	2019-12-28 17:02:50 +01:00
Ghom	fe78c98f71	Merge pull request #10297 from Hatterhat/tg-45547-luxbar ... the one with the luxury bar capsule	2019-12-28 17:00:19 +01:00
Ghom	a7ccd85bdb	Merge pull request #10291 from Citadel-Station-13/kevinz000-patch-1 ... fixes pai holochassis spam	2019-12-28 13:15:42 +01:00
Trilbyspaceclone	fd476b4f5b	Update language_holder.dm	2019-12-28 01:05:51 -05:00
Lin	d562a5ba27	Merge pull request #10212 from Ghommie/Ghommie-cit471 ... Ports some hud and update_icon code updates.	2019-12-28 04:07:03 +00:00
kevinz000	139d4b4b3a	ehh fine but why would you use this proc for that	2019-12-27 18:44:46 -08:00
Lin	80daaacc86	Merge pull request #10268 from Ghommie/Ghommie-cit487 ... Effectively removes the old unused roboticist encryption key and headset.	2019-12-28 00:08:24 +00:00
Lin	be57c26acc	Merge pull request #10289 from Ghommie/Ghommie-cit493 ... [s] fixes a little door assembly glass dupe exploit	2019-12-28 00:06:25 +00:00
Ghom	93248336ea	Merge pull request #10265 from Trilbyspaceclone/map_redo ... Cit-iftyed Box map as well as adding back blasters back to armory	2019-12-27 22:54:35 +01:00
Ghom	13fc20c7c3	Merge pull request #10296 from Useroth/ghostcafe ... Added a ghost role with its own spawner for the purposes of chillling in the ninja holding facility.	2019-12-27 16:30:13 +01:00
Useroth	a3776fb966	Small touch-up.	2019-12-27 16:05:07 +01:00
Useroth	c3298d525f	Good idea, tbh.	2019-12-27 15:57:49 +01:00
Ghom	afd22cf618	Merge pull request #10298 from kappa-sama/patch-12 ... nerfs chain smokers, removes stocks	2019-12-27 13:37:38 +01:00
Ghom	5873ee8ea8	Merge pull request #10264 from Seris02/wintercoatsagain ... Makes cultist coats hold respective items, can actually make them and adds cosmetic versions to the loadout	2019-12-27 13:27:04 +01:00
BlackMajor	4e1a9b83cf	Pushing work for tonight.	2019-12-28 01:01:26 +13:00
Seris02	b4b6e550e4	Merge branch 'wintercoatsagain' of https://github.com/Seris02/Citadel-Station-13 into wintercoatsagain	2019-12-27 18:10:51 +08:00
Seris02	8ed4fe9c05	changes	2019-12-27 18:09:30 +08:00
BlackMajor	e0e521977a	Start just to make the PR	2019-12-27 22:37:57 +13:00
kappa-sama	e97ca5f924	yeah fair enough ... Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>	2019-12-26 14:22:03 -05:00
kappa-sama	1dcee075e6	f	2019-12-26 14:20:43 -05:00
Useroth	35846c452a	Applied suggestions and minor tweaks.	2019-12-26 20:03:43 +01:00
Ghom	05bde370ec	Merge pull request #10250 from Michiyamenotehifunana/polyshorts-for-digis ... Gives Polychromic Shorts a Digitigrade Worn Icon State and Modernizes Polychromic Clothing Code	2019-12-26 16:11:54 +01:00
Ghom	12d0a2ee4c	Merge pull request #10281 from Hatterhat/4-am-coding-more-like-4head ... good idea: .357 speedloaders printable with advanced illegal ballistics, bad idea: revolver now gets an extra speedloader and a box	2019-12-26 16:07:45 +01:00
Ghom	512d046f18	Merge pull request #10128 from Seris02/clownheadset ... gives the clown a headset with a clown megaphone loudmode	2019-12-26 13:58:45 +01:00
Seris02	e125dae871	yee	2019-12-26 16:36:01 +08:00
kappa-sama	4689d805a3	e	2019-12-26 02:54:38 -05:00
Hatterhat	940efc0c1c	holy shit i hope this compiles	2019-12-26 01:46:04 -06:00
Useroth	cbff758d1a	Added a ghost role with its own spawner for the purposes of chillling in the ninja holding facility.	2019-12-26 07:49:48 +01:00
Lin	5670276c70	Merge pull request #10237 from Ghommie/Ghommie-cit479 ... Stops humanoids whose skin_tone variable is set to "albino" from showing up as pale when examined should their species not use skintones anyway.	2019-12-25 19:06:46 +00:00
Lin	1931a2f715	Merge pull request #10242 from Ghommie/Ghommie-cit483 ... Ports "Refactors can_see_reagents"	2019-12-25 19:03:42 +00:00
kevinz000	8dd67afb9c	Update pai_defense.dm	2019-12-24 23:43:16 -08:00
Ghommie	6a5a917944	[s] fixes a little door assembly glass dupe exploit	2019-12-25 07:00:53 +01:00
Ghom	e7cf680ca7	Merge pull request #10266 from shellspeed1/master ... New insect marking customization option and three new wings.	2019-12-25 03:43:29 +01:00
Seris02	a106fde6cc	a few fixes here and there and updating it	2019-12-24 23:38:27 +08:00