cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 23:17:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the TG update not compiling

Browse Source
This commit is contained in:
Albert Iordache
2011-12-27 00:41:11 +02:00
parent f0384fb5c3
commit c6ad5e6255
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
baystation12.dme
+10 -10
View File
@@ -983,16 +983,16 @@
#include "code\WorkInProgress\mapload\reader.dm"
#include "code\WorkInProgress\Mini\customitems.dm"
#include "code\WorkInProgress\SkyMarshal\policetape.dm"
#include "code\WorkInProgress\virus2\Prob.dm"
#include "code\WorkInProgress\virus2\Disease2\analyser.dm"
#include "code\WorkInProgress\virus2\Disease2\base.dm"
#include "code\WorkInProgress\virus2\Disease2\biohazard destroyer.dm"
#include "code\WorkInProgress\virus2\Disease2\cureimplanter.dm"
#include "code\WorkInProgress\virus2\Disease2\curer.dm"
#include "code\WorkInProgress\virus2\Disease2\diseasesplicer.dm"
#include "code\WorkInProgress\virus2\Disease2\dishincubator.dm"
#include "code\WorkInProgress\virus2\Disease2\isolator.dm"
#include "code\WorkInProgress\virus2\Disease2\monkeydispensor.dm"
#include "code\WorkInProgress\virus2\analyser.dm"
#include "code\WorkInProgress\virus2\antibodies.dm"
#include "code\WorkInProgress\virus2\base.dm"
#include "code\WorkInProgress\virus2\biohazard destroyer.dm"
#include "code\WorkInProgress\virus2\cureimplanter.dm"
#include "code\WorkInProgress\virus2\curer.dm"
#include "code\WorkInProgress\virus2\diseasesplicer.dm"
#include "code\WorkInProgress\virus2\dishincubator.dm"
#include "code\WorkInProgress\virus2\isolator.dm"
#include "code\WorkInProgress\virus2\monkeydispensor.dm"
#include "interface\skin.dmf"
#include "maps\tgstation.2.0.8.dmm"
// END_INCLUDE
code/modules/clothing/suits/armor.dm
+1 -1
View File
@@ -84,7 +84,7 @@
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/pepperspray,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
ng/suit/armor/reactive/IsShield()
/obj/item/clothing/suit/armor/reactive/IsShield()
if(active)
return 1
return 0