17542 Commits

Author	SHA1	Message	Date
kevinz000	ae77577ed3	Merge pull request #10239 from Ghommie/Ghommie-cit480 ... Fixing a few consistency issues with Nightmares.	2019-12-30 00:15:03 -08:00
kevinz000	97aadba950	Merge pull request #10259 from Citadel-Station-13/revert-10126-he-tweaks ... Revert "Makes HE pipes realistically radiate away heat"	2019-12-30 00:13:45 -08:00
kevinz000	80606f42ac	Merge pull request #10334 from keronshb/REFLECTORBLOBPORT ... Ports reflector blobs	2019-12-30 00:11:50 -08:00
kevinz000	d1434c767c	Merge pull request #10335 from kappa-sama/patch-12 ... mouth slice	2019-12-30 00:11:38 -08:00
kevinz000	0dc55b209a	Merge pull request #10336 from ItzGabby/Poly-Collar-UI-Fix ... Fixes UI for poly collars	2019-12-30 00:11:27 -08:00
kevinz000	74edd7b13f	Merge pull request #10243 from Putnam3145/lewdchem-better-options ... Lewd chem sanity pass/"ERP preferences"	2019-12-30 00:09:18 -08:00
kevinz000	3f4594d78e	Merge pull request #10312 from Commandersand/prayfornoconflictslel ... ports rp dresses/pants/chaps, available through loadout or vendors(without breaking my github branch)	2019-12-30 00:07:32 -08:00
kevinz000	310d343242	Merge pull request #10095 from Ghommie/Ghommie-cit443 ... Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks.	2019-12-30 00:03:21 -08:00
Putnam3145	640419eed5	Merge pull request #10343 from Ghommie/Ghommie-cit494 ... [s] Fixes anti-ghost-role vars a little.	2019-12-29 20:54:55 -08:00
Ghommie	0ab817c208	[s] Fixes ghost anti-ghostrole timers a little.	2019-12-29 22:22:20 +01:00
Ghom	d1a4bf6895	Merge pull request #10323 from Seris02/pandorafix ... probably fixes pandoras attacking their owners	2019-12-29 17:30:59 +01:00
Ghom	b549670e39	Merge pull request #10324 from Trilbyspaceclone/patch-253 ... Honey no longer murders slimes	2019-12-29 17:24:19 +01:00
ItzGabby	9b5204bd46	Fixes UI for poly collars ... AltClick for collars was seemingly forgotten so I've added it back	2019-12-29 05:15:25 -05:00
kappa-sama	3fad4edae0	mouth	2019-12-28 23:57:07 -05:00
keronshb	ab8a9227b4	Ports reflector blobs ... Ports reflectors from /TG/	2019-12-28 23:02:05 -05: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
Putnam	ed0c91b556	Makes ass slap attempts fail more loudly on opted-out mobs	2019-12-28 16:23:02 -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	4fb549631f	Don't use named arguments on new, please.	2019-12-28 19:12:10 +01:00
Seris02	897766e781	maybe fixes?	2019-12-29 00:55:13 +08:00
Ghom	2ad4698225	Merge pull request #10217 from Putnam3145/radiation ... Nerfing radioactive contamination	2019-12-28 17:21:25 +01:00
Seris02	70744ef171	ah	2019-12-29 00:19:19 +08: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
Seris02	2c26c3bdec	does the fix?	2019-12-28 21:11:17 +08: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	3177b5786a	Update food_reagents.dm	2019-12-28 05:26:46 -05:00
Seris02	973fdb61c6	probably fixes pandoras attacking their owners	2019-12-28 17:33:19 +08: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
Commandersand	1a886adc3d	FIXEdD	2019-12-27 13:01:14 -06:00
Commandersand	815e57697d	vending	2019-12-27 12:29:39 -06:00
Commandersand	6b6ef569c2	fix	2019-12-27 12:14:46 -06:00
Commandersand	45e6cca8b8	clothing add	2019-12-27 11:53:57 -06: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
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
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