Skip to content

Commit

Permalink
Mecha Update (#358)
Browse files Browse the repository at this point in the history
* МЕХИ МЕХИ МЕХИ ТРАХАТБ ТРАХАТБ ТРАХАТБ

* Y

* Update factory.dm

* Update combat_boots.dm

* Update combat_glovers.dm
  • Loading branch information
polerno authored Feb 2, 2024
1 parent 3513356 commit 4396bfe
Show file tree
Hide file tree
Showing 27 changed files with 258 additions and 1,013 deletions.
2 changes: 2 additions & 0 deletions baystation12.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3305,7 +3305,9 @@
#include "proxima\code\modules\clothing\_clothing.dm"
#include "proxima\code\modules\clothing\accessories\cloak.dm"
#include "proxima\code\modules\clothing\accessories\sweater.dm"
#include "proxima\code\modules\clothing\feet\combat_boots.dm"
#include "proxima\code\modules\clothing\feet\feet.dm"
#include "proxima\code\modules\clothing\hands\combat_glovers.dm"
#include "proxima\code\modules\clothing\masks\masks.dm"
#include "proxima\code\modules\clothing\masks\smokable.dm"
#include "proxima\code\modules\clothing\pouch\pouch.dm"
Expand Down
6 changes: 1 addition & 5 deletions code/__defines/flags.dm
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,4 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
#define TANK_FLAG_LEAKING FLAG(2)
#define TANK_FLAG_WIRED FLAG(3)

// Sector Flags.
#define OVERMAP_SECTOR_BASE 0x0001 // Whether or not this sector is a starting sector. Z levels contained in this sector are added to station_levels
#define OVERMAP_SECTOR_KNOWN 0x0002 // Makes the sector show up on nav computers
#define OVERMAP_SECTOR_IN_SPACE 0x0004 // If the sector can be accessed by drifting off the map edge
#define OVERMAP_SECTOR_UNTARGETABLE 0x0008 // If the sector is untargetable by missiles

3 changes: 2 additions & 1 deletion code/modules/mechs/components/arms.dm
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
name = "combat arms"
exosuit_desc_string = "flexible, advanced manipulators"
icon_state = "combat_arms"
melee_damage = 5
melee_damage = 15
action_delay = 10
max_damage = 45
power_use = 50
2 changes: 2 additions & 0 deletions code/modules/mechs/components/body.dm
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,8 @@
pilot_coverage = 100
exosuit_desc_string = "an armoured chassis"
icon_state = "combat_body"
max_damage = 120
mech_health = 250
power_use = 40

/obj/item/mech_component/chassis/combat/prebuild()
Expand Down
7 changes: 4 additions & 3 deletions code/modules/mechs/components/legs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
desc = "A classic brought back. The Hephaestus' Landmaster class tracks are impervious to most damage and can maintain top speed regardless of load. Watch out for corners."
icon_state = "tracks"
max_damage = 150
move_delay = 2 //It´s fast
move_delay = 1 //It´s fast
turn_delay = 7
power_use = 150

Expand All @@ -120,6 +120,7 @@
name = "combat legs"
exosuit_desc_string = "sleek hydraulic legs"
icon_state = "combat_legs"
move_delay = 3
turn_delay = 3
move_delay = 4
turn_delay = 4
max_damage = 130
power_use = 20
72 changes: 72 additions & 0 deletions code/modules/mechs/equipment/combat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -606,3 +606,75 @@

if(owner)
owner.update_icon()

//PRX MECH BALLISTIC

/obj/item/gun/energy/mech_minigun/mounted
name = "mech machingegun"
desc = "You shouldn't see this!"
icon = 'proxima/icons/obj/guns/guns.dmi'
icon_state = "minigun"
force = 10
projectile_type = /obj/item/projectile/bullet/rifle/military
max_shots = 100
multi_aim = 1
fire_delay=0
autofire_enabled=1
burst = 5
accuracy = 3
bulk = GUN_BULK_RIFLE
w_class = ITEM_SIZE_HUGE
one_hand_penalty= 0

self_recharge = TRUE
recharge_time = 3
use_external_power = TRUE
has_safety = FALSE

/obj/item/mech_equipment/mounted_system/taser/minigun
name = "mounted gatling gun"
desc = "An exosuit-mounted gatling gun.You will need 12 thousand tallers to shoot 4 seconds from this cannon."
icon_state = "mech_ballistic2"
holding_type = /obj/item/gun/energy/mech_minigun/mounted
restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND)
restricted_software = list(MECH_SOFTWARE_WEAPONS)

/obj/item/gun/energy/rocket_launcher/mounted
name = "rocket launcher"
desc = "You shouldn't see this!"
icon = 'proxima/icons/obj/guns/guns.dmi'
icon_state = "syndie_mgl"
force = 10
projectile_type = /obj/item/projectile/rocket_le
max_shots = 6
multi_aim = 1
fire_delay=0
autofire_enabled=1
burst = 1
accuracy = -1
bulk = GUN_BULK_RIFLE
w_class = ITEM_SIZE_HUGE
one_hand_penalty= 0

self_recharge = TRUE
recharge_time = 6
use_external_power = TRUE
has_safety = FALSE

/obj/item/mech_equipment/mounted_system/taser/rocket_launcher
name = "mounted rocket launcher"
desc = "An exosuit-mounted rocket laucher.Do you see why I have one eye? BECAUSE IF I WERE A BAD DEMOMAN, I WOULDN'T SHOW YOU THAT EYE."
icon_state = "mech_resin"
holding_type = /obj/item/gun/energy/rocket_launcher/mounted
restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND)
restricted_software = list(MECH_SOFTWARE_WEAPONS)


/obj/item/projectile/rocket_le
name = "minirocket"
fire_sound = 'sound/effects/Explosion1.ogg'

/obj/item/projectile/rocket_le/on_hit(var/atom/target, var/blocked = 0)
if(isturf(target))
explosion(target, 3, 5, 8, 1)
..()
140 changes: 0 additions & 140 deletions code/modules/overmap/contacts/_contact.dm

This file was deleted.

Loading

0 comments on commit 4396bfe

Please sign in to comment.