cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-29 15:06:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into ofMechfabAndPanic

Browse Source 
Conflicts:
	code/game/mecha/mech_fabricator.dm
	maps/exodus-1.dmm
This commit is contained in:
Kelenius
2015-08-24 18:16:36 +03:00
parent 6ba41bbc2a 0012470db2
commit dd11a301e4
294 changed files with 7810 additions and 7252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/robot/robot_upgrades.dm
+2 -2
View File
@@ -29,10 +29,10 @@
R.modtype = initial(R.modtype)
R.hands.icon_state = initial(R.hands.icon_state)
R.choose_icon(1, R.set_module_sprites(list("Default" = "robot")))
R.notify_ai(ROBOT_NOTIFICATION_MODULE_RESET, R.module.name)
R.module.Reset(R)
qdel(R.module)
R.module = null
R.updatename("Default")
return 1