Skip to content

modular karl 2 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
l3lb0t wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

modular karl 2 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions code/__defines/armor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
// Some levels are marked with what they intend to block in such way.

#define ARMOR_BALLISTIC_MINOR 10
#define ARMOR_BALLISTIC_SMALL 25
#define ARMOR_BALLISTIC_PISTOL 50 //Blocks holdout and normal pistol ammo
#define ARMOR_BALLISTIC_RESISTANT 65
#define ARMOR_BALLISTIC_RIFLE 80 //Blocks rifle rounds
#define ARMOR_BALLISTIC_AP 95
#define ARMOR_BALLISTIC_HEAVY 110
#define ARMOR_BALLISTIC_SMALL 15
#define ARMOR_BALLISTIC_PISTOL 30
#define ARMOR_BALLISTIC_RESISTANT 60
#define ARMOR_BALLISTIC_RIFLE 90
#define ARMOR_BALLISTIC_AP 120
#define ARMOR_BALLISTIC_HEAVY 150

#define ARMOR_LASER_MINOR 10
#define ARMOR_LASER_SMALL 25 //Blocks small e-guns
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/__item.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
for(var/type in armor)
if(armor[type]) // Don't set it if it gives no armor anyway, which is many items.
set_extension(src, armor_type, armor, armor_degradation_speed)
break

if(randpixel && (!pixel_x && !pixel_y) && isturf(loc)) //hopefully this will prevent us from messing with mapper-set pixel_x/y
pixel_x = rand(-randpixel, randpixel)
pixel_y = rand(-randpixel, randpixel)
Expand Down
1 change: 1 addition & 0 deletions maps/modpack_testing/modpack_testing.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "../../mods/content/bigpharma/_bigpharma.dme"
#include "../../mods/content/biomods/_biomods.dme"
#include "../../mods/content/blacksmithy/_blacksmithy.dme"
#include "../../mods/content/bosniastation/_bosniastation.dme"
#include "../../mods/content/blob/_blob.dme"
#include "../../mods/content/breath_holding/_breath_holding.dme"
#include "../../mods/content/byond_membership/_byond_membership.dm"
Expand Down
2 changes: 2 additions & 0 deletions mods/content/bosniastation/_bosniastation.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/decl/modpack/bosnia
name = "Bosniastation"
9 changes: 9 additions & 0 deletions mods/content/bosniastation/_bosniastation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#ifndef MODPACK_BOSNIA
#define BOSNIA
// BEGIN_INCLUDE
#include "_bosniastation.dm"
#include "armor_rework.dm"
#include "organ_rework.dm"
#include "organ_tweaks.dm"
// END_INCLUDE
#endif
Loading
Loading