Commit Graph

4870 Commits

Author SHA1 Message Date
Tigercat2000
d2ea2ae2e1 Fix pAI interface (somewhat) 2015-11-20 21:23:31 -08:00
TheDZD
0e33b7b65e Merge pull request #2610 from Fox-McCloud/bags-and-qol
Chemistry and Bio-Bags and Xenobio QoL
2015-11-20 20:45:15 -05:00
TheDZD
c338c094fa Merge pull request #2602 from Fox-McCloud/sofas-and-barber-chairs
Adds in Ability to Makes Sofas and Barber Chairs
2015-11-20 19:46:53 -05:00
TheDZD
bbab399d6e Merge pull request #2599 from Fox-McCloud/thanksgiving-food
Thanksgiving Update
2015-11-20 19:46:47 -05:00
Fox-McCloud
edf2bfc4fc Chemistry and Bio-Bags and Xenobio QoL 2015-11-19 20:38:07 -05:00
TheDZD
bcdcfe728b Merge pull request #2603 from Fox-McCloud/rcs-exploit-fix
Fixes RCS Teleport Exploit
2015-11-19 20:14:07 -05:00
Fox McCloud
f52cc886b8 Merge pull request #2565 from ZomgPonies/nations
Nations 2.0
2015-11-19 19:33:21 -05:00
TheDZD
dae629d599 Merge pull request #2591 from Fox-McCloud/spider-faction
Spiderling and Factions
2015-11-19 15:33:16 -05:00
ZomgPonies
6c907de639 Cleaning up following DZD's recommendations 2015-11-19 15:24:06 -05:00
Fox-McCloud
763d0e23c0 Fixes RCS Teleport Exploit 2015-11-19 01:59:46 -05:00
Fox-McCloud
c2fc9da61b Adds in Ability to Makes Sofas and Barber Chairs 2015-11-19 01:29:32 -05:00
Fox-McCloud
0e3a6a0857 map 2015-11-19 00:23:57 -05:00
Fox-McCloud
f43e21698c Updates 2015-11-18 23:17:31 -05:00
Fox McCloud
8c1f11fb0b Merge pull request #2566 from Robertha89/master
Fixes invisible wrapping paper, sonic jackhammer not breaking walls and field surgery kit not fitting its own content
2015-11-18 21:26:23 -05:00
Robertha89
b774e54a4d Forgot two " 2015-11-19 00:41:18 +01:00
Robertha89
51d3724abf Typos, fixes and whatnot 2015-11-19 00:36:56 +01:00
Fox-McCloud
bdd45eacdc Spiderling and Factions 2015-11-18 14:51:04 -05:00
Fox McCloud
d07bce4a66 Merge pull request #2515 from Spacemanspark/master
Adds in toy chainsaws.
2015-11-18 14:04:17 -05:00
Spacemanspark
eb28de5e42 Removes useless return statement from toy chainsaws
If this breaks something I'm going to remove Tigercat's soul.
2015-11-17 19:31:48 -06:00
Robertha89
5c50d20d67 Fixes field surgical kits 2015-11-16 08:51:43 +01:00
Aurorablade
bc7a0864d5 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into TooSpoopy 2015-11-16 01:15:41 -05:00
Robertha89
3936231e53 Fixes Sonic Jackhammer 2015-11-15 21:53:21 +01:00
TheDZD
dc24c9b99d Merge pull request #2552 from tigercat2000/ugh_really
WHEELCHAIRS ARE NOT SPORTS BIKES
2015-11-15 11:59:28 -05:00
Fox McCloud
0b5875992b Merge pull request #2538 from Crazylemon64/miner_announce
Additional Requests Console Functionality
2015-11-15 08:17:20 -05:00
Tigercat2000
89b1472929 whoops not that slow 2015-11-14 21:17:53 -08:00
Tigercat2000
0a7225e8eb wheelchair speeds 2015-11-14 21:09:23 -08:00
TheDZD
64533c3c56 Merge pull request #2535 from Fox-McCloud/snacks
Snacks
2015-11-14 18:25:05 -05:00
Crazylemon64
1b4a39eb24 MULEbots notify on relevant deliveries
Also:
	-Adds more request consoles throughout the map
		- Atmospherics, Brig Medbay, Warden, Security
2015-11-14 14:29:24 -08:00
Fox-McCloud
c08959423c Snacks 2015-11-13 17:16:47 -05:00
Tigercat2000
1023727689 Fix UI issues, fix weird modkit list 2015-11-11 17:55:36 -08:00
Tigercat2000
9186d94ba1 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
Conflicts:
	icons/mob/suit.dmi
2015-11-11 16:51:44 -08:00
TheDZD
b72280c2e2 Merge pull request #2512 from Fox-McCloud/pneumatic-cannon
Ports TG Pneumatic Cannon
2015-11-11 09:52:16 -05:00
Spacemanspark
2365949a69 FIXFIXFIXFIXFIXAHHHHHHHHHHH 2015-11-10 19:19:29 -06:00
Spacemanspark
20822be0cb Makes code smaller. 2015-11-10 19:15:45 -06:00
Spacemanspark
51d874fb8f D'OH. 2015-11-10 19:11:36 -06:00
Spacemanspark
8a9908e6db Makes toy chainsaws into their own base. 2015-11-10 19:05:18 -06:00
Spacemanspark
8192127aec Removes the istype() statement from chainsaws. 2015-11-10 19:04:53 -06:00
TheDZD
0e94e359f1 Merge pull request #2506 from Fox-McCloud/kitchen-changes
Kitchen Updates
2015-11-10 19:35:29 -05:00
Spacemanspark
38072c2372 Removes the now nonexistant variable from toy chainsaws. 2015-11-10 16:20:48 -06:00
Spacemanspark
2e1e0ee3ea Use an istype statement rather than a new variable. 2015-11-10 16:20:05 -06:00
Spacemanspark
c688479e61 Toy chainsaw! 2015-11-10 15:53:39 -06:00
Spacemanspark
f552ab1b7f Prevents toy chainsaws from stunning people when used. 2015-11-10 15:51:47 -06:00
Fox-McCloud
bfac0b62fa Ports TG Pneumatic Cannon 2015-11-09 22:54:05 -05:00
TheDZD
0aee56a1e7 Merge pull request #2501 from Fox-McCloud/plants
Adds Additional Plant Sprites
2015-11-09 20:16:00 -05:00
TheDZD
5d0677f714 Merge pull request #2500 from Fox-McCloud/fish-kit
Aquarium Starter Kit
2015-11-09 20:15:55 -05:00
Tastyfish
c9852cb34f Made it check for recursive buckling again too 2015-11-09 02:29:18 -05:00
Fox-McCloud
ab3ed53734 Kitchen Updates 2015-11-09 01:09:59 -05:00
Tastyfish
c91657477e Fixed buckling to check for someone already buckling correctly, and to tell subclasses that buckling was successful correctly 2015-11-09 00:26:34 -05:00
Fox-McCloud
3ce2c790e8 Adds Additional Plant Sprites 2015-11-08 07:58:37 -05:00
Fox-McCloud
318c464f94 Aquarium Starter Kit 2015-11-08 07:38:09 -05:00