Commit Graph

18888 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
Fox McCloud
cdf1a6ca51 Merge pull request #2567 from Tastyfish/passivegate
Made passive vent equalize pressure
2015-11-15 19:08:58 -05:00
Tastyfish
3b5a95ced4 Made passive vent equalize pressure 2015-11-15 16:17:53 -05: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
TheDZD
18c428516b Merge pull request #2549 from Tastyfish/jukebox
Made jukebox volume update work more reliably when buffering is slow
2015-11-15 11:59:23 -05:00
TheDZD
77b7635ce0 Merge pull request #2542 from Tastyfish/poly
Lets parrots speak on Common radio, as code intended.
2015-11-15 11:59:17 -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
Tastyfish
c9dfd96bb1 Made jukebox volume update work more reliably when buffering is slow 2015-11-14 22:29:49 -05:00
TheDZD
ff8e86024a Merge pull request #2529 from Fox-McCloud/baby-carp
Allows you to Gut Baby Carp
2015-11-14 18:26:37 -05:00
TheDZD
64533c3c56 Merge pull request #2535 from Fox-McCloud/snacks
Snacks
2015-11-14 18:25:05 -05:00
Fox-McCloud
2bc2b1958d refactor 2015-11-14 18:21:45 -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
Tastyfish
45a339069d Lets parrots speak on Common radio, as code intended. 2015-11-14 15:30:10 -05: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
TheDZD
86f22c0f76 Merge pull request #2531 from Tastyfish/master
Fixed the lighting when placing floor plating.
2015-11-14 14:28:48 -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
TheDZD
dfde703d50 Merge pull request #2536 from Fox-McCloud/stamina-fix
Fixes Stamina
2015-11-14 09:29:10 -05: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
tigercat2000
e4d4bfc899 why humans why 2015-11-13 20:55:24 -08:00
Tigercat2000
27a011e44f fix stunned shit 2015-11-13 20:47:18 -08:00
Fox-McCloud
fc9aff7128 Fixes Stamina 2015-11-13 23:15:36 -05:00
Fox-McCloud
c08959423c Snacks 2015-11-13 17:16:47 -05:00
Tigercat2000
0bb6f36e4a Fixes medhud/sechud/etc shit, ai life refactor
Dear god please nuke AI code from the face of this earth.
2015-11-13 07:28:45 -08: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
Tastyfish
e5fe114e24 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-11-12 22:42:51 -05:00
Tastyfish
3f264936a1 Make placing floor plating on space actually update lighting correctly 2015-11-12 22:42:16 -05:00
TheDZD
213a8aeedd Merge pull request #2520 from Fox-McCloud/recipe-fix
Recipe Fix
2015-11-12 22:24:37 -05:00
Fox-McCloud
d150545f74 Allows you to Gut Baby Carp 2015-11-12 21:27:42 -05:00
Tigercat2000
9e5e81325e Fix Vision code weirdness 2015-11-12 17:47:33 -08:00
Tigercat2000
056585399b Fix carbon/Life()
yeah whoops
APPARENTLY BAY HAD LIVING/LIFE() AND CARBON/LIFE()
damnit bay
2015-11-12 16:53:41 -08: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
Fox-McCloud
a123b10572 Recipe Fix 2015-11-11 22:27:40 -05:00
Tigercat2000
2c5201614e Robustify Floortile launcher
Whoops, left it using /obj/item/stack/tile, which are debug items. Also,
spelling.
2015-11-11 18:07:25 -08: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
3f51bd5715 Merge pull request #2513 from Fox-McCloud/adminbus
Adminbus Items
2015-11-11 09:52:06 -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
2e5224f0c9 Merge pull request #2510 from Tastyfish/master
Fixed problems with media machines (ie jukebox)
2015-11-10 19:26:06 -05:00
Fox-McCloud
5f87575cf6 proper destroy 2015-11-10 04:25:57 -05:00
Fox-McCloud
c9da7b5d7c Adminbus Items 2015-11-10 04:21:21 -05:00
Tastyfish
f34dc3688e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-11-09 23:54:08 -05:00
Fox-McCloud
bfac0b62fa Ports TG Pneumatic Cannon 2015-11-09 22:54:05 -05:00