cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 11:07:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into powernet

Browse Source 
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
	code/game/machinery/alarm.dm
	code/modules/power/smes.dm
This commit is contained in:
Markolie
2015-08-01 21:44:47 +02:00
parent 0a4a2f34cf 4028c2af12
commit aca3a2cecb
36 changed files with 483 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot_modules.dm
+1 -2
View File
@@ -405,8 +405,7 @@
src.modules += new /obj/item/weapon/reagent_containers/spray/cleaner/drone(src)
src.modules += new /obj/item/weapon/soap(src)
src.emag = new /obj/item/weapon/gun/energy/plasmacutter(src)
src.emag.name = "Plasma Cutter"
src.emag = new /obj/item/weapon/pickaxe/drill/cyborg/diamond(src)
for(var/T in stacktypes)
var/obj/item/stack/sheet/W = new T(src)