Commit Graph

10250 Commits

Author SHA1 Message Date
Crazylemon
79b73966e8 Mechanic now has access to ore reclaimer
Space pod fleet ahoy!
2015-11-16 19:43:06 -08:00
Tastyfish
91ed12e29d Fixed battle arcade circuit board type 2015-11-15 14:37:15 -05: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
TheDZD
7018d70344 Merge pull request #2532 from Tastyfish/barricade
A proposed way to make barricades dismantlable sanely.
2015-11-14 14:29:11 -05:00
Tigercat2000
9101157b1b Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
Conflicts:
	code/modules/mob/living/carbon/human/species/species.dm
2015-11-14 07:01:36 -08:00
Crazylemon64
da37bbeb6a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into miner_announce 2015-11-13 21:56:32 -08:00
Crazylemon64
9e43f4dba9 Ore processor now notifies when ores are ready
Also adds in a request console to the Mechanic, and fixes the request
console sprite update code
2015-11-13 21:18:52 -08:00
Fox-McCloud
c08959423c Snacks 2015-11-13 17:16:47 -05:00
Crazylemon
5636d721b0 Initial test of tg-esque mineral reclaimer announcements 2015-11-12 22:32:43 -08:00
Tastyfish
20980ab7ae Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into barricade 2015-11-12 22:55:43 -05:00
Fox-McCloud
a23db0e5c0 Fixes Acquarium Kits 2015-11-12 04:02:07 -05:00
Tastyfish
44d4324d98 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into barricade 2015-11-12 00:48:28 -05:00
Tastyfish
fd459b0ba9 Added being able to destroy wooden barrier with crowbar 2015-11-12 00:48:03 -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
TheDZD
0e94e359f1 Merge pull request #2506 from Fox-McCloud/kitchen-changes
Kitchen Updates
2015-11-10 19:35:29 -05:00
Fox-McCloud
bfac0b62fa Ports TG Pneumatic Cannon 2015-11-09 22:54:05 -05:00
Fox McCloud
4325daaabc Merge pull request #2497 from tigercat2000/html5_stuff
HTML5, IE11, CSS3
2015-11-09 20:59:14 -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
TheDZD
ffd8f4dbb9 Merge pull request #2508 from Fox-McCloud/exploit-fix
Dwarf Exploit Fix
2015-11-09 06:14:41 -05:00
Fox-McCloud
a5dc73c584 Dwarf Exploit Fix 2015-11-09 04:14:48 -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
TheDZD
e9ac5b16a3 Merge pull request #2493 from Fox-McCloud/brig-door-announcement
Brig Door Release Announcement
2015-11-08 17:33:39 -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
Tigercat2000
29f42f8b61 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/silicon/pai/life.dm
2015-11-07 20:54:24 -08:00
Fox McCloud
cc6dcd72bb Merge pull request #2468 from tigercat2000/tg-life
-tg- Life() refactors
2015-11-07 23:08:01 -05:00
Tigercat2000
77cdaedb42 Merge remote-tracking branch 'upstream/master' into html5_stuff 2015-11-07 19:20:45 -08:00
Tigercat2000
6d0be927ba Fix nanomap dragging & supply console
Nanomap coordinates are fucked, I'm not even going to think of touching
the calculations for that shit.
2015-11-07 10:49:25 -08:00
Fox-McCloud
187c49112c Brig Door Release Announcement 2015-11-07 00:11:15 -05:00
Fox-McCloud
16a208f545 Circuit Board Repathing and Swarmer Fixes 2015-11-06 21:21:36 -05:00
Tigercat2000
8e74283240 Fix traffic control computer 2015-11-06 12:02:57 -08:00
Tigercat2000
d36352ae7c HTML5 and CSS3 for NanoUI + Datum Browser 2015-11-06 11:27:32 -08:00
Fox-McCloud
2335c6be9d Merge remote-tracking branch 'upstream/master' into barber-update 2015-11-06 06:30:59 -05:00
TheDZD
d504f33752 Merge pull request #2469 from Fox-McCloud/smoking
Adds Random Cigs
2015-11-06 06:15:01 -05:00
Fox-McCloud
1c8df180f8 Merge remote-tracking branch 'upstream/master' into barber-update 2015-11-05 19:42:41 -05:00
TheDZD
9d365d3f66 Merge pull request #2467 from Fox-McCloud/hammer-time
Various Fixes
2015-11-05 18:51:39 -05:00
TheDZD
4556e60030 Merge pull request #2473 from Fox-McCloud/blood
Bloody Mess Fix
2015-11-05 17:45:02 -05:00
Fox-McCloud
85d9c29283 final touches 2015-11-05 17:10:09 -05:00
Fox-McCloud
c4b0a91789 better handling 2015-11-05 11:01:58 -05:00
Fox-McCloud
ef5379b11b colored light 2015-11-05 10:40:11 -05:00