26513 Commits

Author	SHA1	Message	Date
Fox McCloud	5fdca7b4ec	Merge pull request #8009 from matt81093/cyborg_module_patch ... Allows medical cyborgs to diagnose IPC's with robutt analyzer	2017-08-28 18:39:55 -04:00
Fox McCloud	04ee51da86	Merge pull request #7977 from Birdtalon/mining-robots ... Nanotrasen Mining Bots take EMP damage.	2017-08-28 18:24:36 -04:00
Fox McCloud	3c3b384824	Merge pull request #7982 from Aurorablade/InsertGodHere ... ALL HAIL <INSERT GOD HERE>!	2017-08-28 18:24:22 -04:00
Fox McCloud	71cfaa2325	Merge pull request #7983 from Birdtalon/wall-lockers ... Control click to open wall lockers.	2017-08-28 18:24:08 -04:00
Fox McCloud	70cd062699	Merge pull request #7999 from Birdtalon/door-remote ... Buffs the HoP Door remote	2017-08-28 18:23:55 -04:00
Fox McCloud	43e8e2d334	Merge pull request #7989 from Aurorablade/Ihateyoupeople ... Removes the special off Cult Daggers	2017-08-28 18:15:51 -04:00
Crazy Lemon	fdc8c6dc37	Merge pull request #8010 from Birdtalon/bee-cease ... Makes Syndicate Bee-case sound local.	2017-08-28 15:10:34 -07:00
tigercat2000	f747d4948b	Merge pull request #7920 from Fox-McCloud/musics ... Adds a Bunch of Instruments	2017-08-28 14:21:39 -07:00
tigercat2000	414524b9d2	Merge pull request #8013 from Jovaniph/holosword ... Holodeck Sword Sound	2017-08-28 13:43:12 -07:00
Crazy Lemon	8c0014de9a	Merge pull request #8011 from Landerlow/moredisabilities ... Adds more roundstart disability options	2017-08-28 13:30:33 -07:00
Fox-McCloud	16bff9cc86	longer musics	2017-08-27 19:49:40 -04:00
Birdtalon	b6b0970d76	commas are important	2017-08-26 23:13:20 +01:00
Birdtalon	553a79984f	adds protein and tomatojuice to the pizza	2017-08-26 23:02:10 +01:00
Birdtalon	af2035af2b	pineapples grow on plants not trees	2017-08-26 22:47:05 +01:00
Birdtalon	53a141f9ca	recipe change	2017-08-26 22:36:44 +01:00
Birdtalon	bf5ea8fcea	final additions	2017-08-26 22:33:01 +01:00
Birdtalon	0daed1cfe2	adds pineapple and derivatives	2017-08-26 22:07:51 +01:00
Jovaniph	e0303df139	Holodeck Esword	2017-08-26 08:46:50 -04:00
Landerlow	9a01252a2a	Added the scrambled speech to the list and changed dizziness	2017-08-26 12:46:46 +02:00
Aurorablade	66fc88f4af	Shoo..	2017-08-25 20:48:05 -04:00
Landerlow	71be8f3c8b	Adds more roundstart disability options	2017-08-25 18:44:33 +02:00
Birdtalon	ad703a69a1	makes the bee-case sound local	2017-08-24 23:58:24 +01:00
tigercat2000	6e7d9748da	Merge pull request #8002 from Fox-McCloud/internal-bleeding-fix ... Fixes Bloodless Internal Bleeding	2017-08-24 06:51:50 -07:00
tigercat2000	b110ff791f	Merge pull request #7991 from Birdtalon/cultstructures ... Cult structures take damage from melee and projectiles.	2017-08-24 06:50:40 -07:00
Matthew Kelley	88e989e5d2	Allows medical cyborgs to diagnose IPC's	2017-08-24 03:37:10 -05:00
Fox-McCloud	6a24d8bc02	Fixes Bloodless Internal Bleeding	2017-08-22 17:25:27 -04:00
Birdtalon	edb8c83bb1	fixes my derp	2017-08-22 16:19:22 +01:00
Birdtalon	d7a6833268	alters door remotes	2017-08-22 16:12:12 +01:00
Birdtalon	410607d249	missed an operator	2017-08-17 09:48:15 +01:00
Birdtalon	272b5f2210	Fox Requests	2017-08-17 09:36:23 +01:00
Fox McCloud	e24d8d3c28	Merge pull request #7940 from Citinited/cleaning-disposals ... [s]Fixes an issue with the disposal system	2017-08-16 21:33:31 -04:00
Fox McCloud	13c112358a	Merge pull request #7534 from Kyep/ssd_button ... Admin 'List SSDs' verb & cryo option	2017-08-16 19:58:52 -04:00
Fox-McCloud	881c0e9d92	Merge remote-tracking branch 'upstream/master' into musics	2017-08-16 19:12:46 -04:00
Fox-McCloud	cf4735a069	Merge remote-tracking branch 'upstream/master' into HUNKE	2017-08-16 18:36:30 -04:00
Birdtalon	2b774dc1e5	allows cult structures to die	2017-08-16 21:10:23 +01:00
tigercat2000	ebabda1223	Merge pull request #7366 from KasparoVy/mob_rgb_to_hex ... Converts Mob Colours to Hexadecimal	2017-08-16 12:52:13 -07:00
tigercat2000	608a0b0644	Merge pull request #7759 from Citinited/flagged-for-review ... Adds in-hand sprites for missing flags; adds a plasmaman flag; miscellaneous flag tweaks	2017-08-16 12:11:05 -07:00
Crazy Lemon	57891127b4	Merge pull request #7963 from Aurorablade/FORTHESWARM ... Swarmer Tweaks	2017-08-16 11:58:02 -07:00
Aurorablade	ca17cc865c	tweak	2017-08-15 23:55:29 -04:00
Fox McCloud	5fa583aaea	Merge pull request #7984 from Birdtalon/swarming ... AI Damage Sanity check (Prevents swarmers killing it)	2017-08-15 22:27:49 -04:00
Birdtalon	fc36a61b21	Fox adjustment	2017-08-15 18:32:23 +01:00
Birdtalon	808c35a7ab	sanity checking for AI damage	2017-08-15 18:27:17 +01:00
Aurorablade	1779d14c46	Chaplain only god in prayer..maybe..	2017-08-15 05:05:11 -04:00
Aurorablade	008ab50d90	dammit	2017-08-15 02:30:27 -04:00
Aurorablade	cc3f7ef188	cuffs	2017-08-14 23:52:10 -04:00
Fox McCloud	4da7fba866	Merge pull request #7986 from Birdtalon/medbutts ... Hacky "Fix" for medbot internal beakers	2017-08-14 23:02:27 -04:00
Aurorablade	46b99794b0	Surgery Fix	2017-08-14 18:50:58 -04:00
Birdtalon	d19d319eb1	horrible hacky fix	2017-08-14 19:32:18 +01:00
tigercat2000	f74e0cb0e5	Merge pull request #7966 from AndrewMontagne/feature/improve-modular-computers ... Fixes for Modular Computers	2017-08-14 11:26:07 -07:00
tigercat2000	d90229e2ad	Merge pull request #7839 from taukausanake/buffs_duffs ... Buffs duffs	2017-08-14 10:57:06 -07:00