Update smartfridge types, merge branch 'master' of https://github.com/ParadiseSS13/Paradise into powernet

Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
This commit is contained in:
Markolie
2015-08-01 19:35:39 +02:00
41 changed files with 629 additions and 385 deletions
@@ -38,7 +38,9 @@
R.languages = list()
R.speech_synthesizer_langs = list()
R.notify_ai(2)
R.updateicon()
R.jetpackoverlay = 0
R.update_icons()
R.update_headlamp()
R.add_language("Robot Talk", 1)
return 1
@@ -156,7 +158,8 @@
R.module.modules += new/obj/item/weapon/tank/jetpack/carbondioxide
for(var/obj/item/weapon/tank/jetpack/carbondioxide in R.module.modules)
R.internals = src
//R.icon_state="Miner+j"
R.jetpackoverlay = 1
R.update_icons()
return 1
/obj/item/borg/upgrade/ddrill
@@ -53,6 +53,7 @@
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/device/flash(src)
new /obj/item/weapon/mining_voucher(src)
new /obj/item/clothing/accessory/petcollar(src)
return