cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 05:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds missing changelog icon to the client pre-fetch.

Browse Source
This commit is contained in:
PsiOmegaDelta
2015-06-30 15:09:33 +02:00
parent b7bdd4b583
commit a76c915e2e
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/machinery/portable_turret.dm
View File

@@ -347,9 +347,9 @@ var/list/turret_icons
/obj/machinery/porta_turret/proc/take_damage(var/force) /obj/machinery/porta_turret/proc/take_damage(var/force)
if(!raised && !raising) if(!raised && !raising)
if(force < 10)
return
force = force / 8 force = force / 8
if(force < 5)
return
health -= force health -= force
if (force > 5 && prob(45)) if (force > 5 && prob(45))
@@ -361,9 +361,6 @@ var/list/turret_icons
if(Proj.damage_type == HALLOSS) if(Proj.damage_type == HALLOSS)
return return
if(!raised && !raising)
return
if(enabled) if(enabled)
if(!attacked && !emagged) if(!attacked && !emagged)
attacked = 1 attacked = 1

1
code/modules/mob/mob.dm
View File

@@ -376,6 +376,7 @@
'html/hard-hat-exclamation.png', 'html/hard-hat-exclamation.png',
'html/image-minus.png', 'html/image-minus.png',
'html/image-plus.png', 'html/image-plus.png',
'html/map-pencil.png',
'html/music-minus.png', 'html/music-minus.png',
'html/music-plus.png', 'html/music-plus.png',
'html/tick-circle.png', 'html/tick-circle.png',