mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-27 15:17:01 +01:00
Squashed commit:
[c9795d3] Writing and formatting tweaks [65aae64] Tweaks to messages and notices, formatting, and cleanup. (+2 squashed commit) Squashed commit: [995a61b] I guess I should call them for what they are (9mm) [0f04213] - tweak: "While attempting a Hostile Takeover, gangs do not gain influence. Instead, the takeover timer will be reduced by how many territories they control." - tweak: "Tommy guns no longer deal stamina damage." [202c743] Recruitment Pen cooldown is reduced by 10 seconds for every additional member your rival gang has over yours with a minimum of a 5 second cooldown [c1a3af3] Pen cooldown = 2 minutes Fixed gang dominators reporting the wrong time on examine() (+4 squashed commit) Squashed commit: [78c043e] Pen Cooldown returned to 60 seconds Spray can cost halved to 5 influence [4e65dff] - Capped outfits in stock to 10 [1f347a9] Changelog [615c971] - Added white suits to gang outfits - Gang outfits are free, but are limited in stock (that replenishes over time) (+2 squashed commit) Squashed commit: [1f347a9] Changelog [615c971] - Added white suits to gang outfits - Gang outfits are free, but are limited in stock (that replenishes over time) (+2 squashed commit) Squashed commit: [202c743] Recruitment Pen cooldown is reduced by 10 seconds for every additional member your rival gang has over yours with a minimum of a 5 second cooldown [c1a3af3] Pen cooldown = 2 minutes Fixed gang dominators reporting the wrong time on examine() (+4 squashed commit) Squashed commit: [78c043e] Pen Cooldown returned to 60 seconds Spray can cost halved to 5 influence [4e65dff] - Capped outfits in stock to 10 [1f347a9] Changelog [615c971] - Added white suits to gang outfits - Gang outfits are free, but are limited in stock (that replenishes over time) (+2 squashed commit) Squashed commit: [1f347a9] Changelog [615c971] - Added white suits to gang outfits - Gang outfits are free, but are limited in stock (that replenishes over time)
This commit is contained in:
@@ -95,24 +95,22 @@
|
||||
if(user.mind in ticker.mode.A_bosses)
|
||||
if(ticker.mode.add_gangster(M.mind,"A"))
|
||||
M.Paralyse(5)
|
||||
cooldown(ticker.mode.A_gang.len, )
|
||||
cooldown(max(0,ticker.mode.B_gang.len - ticker.mode.A_gang.len))
|
||||
else
|
||||
user << "<span class='warning'>This mind is resistant to recruitment!</span>"
|
||||
else if(user.mind in ticker.mode.B_bosses)
|
||||
if(ticker.mode.add_gangster(M.mind,"B"))
|
||||
M.Paralyse(5)
|
||||
cooldown(ticker.mode.B_gang.len)
|
||||
cooldown(max(0,ticker.mode.A_gang.len - ticker.mode.B_gang.len))
|
||||
else
|
||||
user << "<span class='warning'>This mind is resistant to recruitment!</span>"
|
||||
else
|
||||
user << "<span class='warning'>This mind is so vacant that it is not susceptible to influence!</span>"
|
||||
|
||||
/obj/item/weapon/pen/gang/proc/cooldown(modifier)
|
||||
if(!modifier)
|
||||
return
|
||||
cooldown = 1
|
||||
icon_state = "pen_blink"
|
||||
spawn(1200)
|
||||
spawn(max(50,1200-(modifier*100)))
|
||||
cooldown = 0
|
||||
icon_state = "pen"
|
||||
var/mob/M = get(src, /mob)
|
||||
|
||||
@@ -31,7 +31,6 @@
|
||||
caliber = ".45"
|
||||
projectile_type = /obj/item/projectile/bullet/midbullet
|
||||
|
||||
|
||||
/obj/item/ammo_casing/shotgun
|
||||
name = "shotgun slug"
|
||||
desc = "A 12 gauge lead slug."
|
||||
|
||||
@@ -157,11 +157,11 @@
|
||||
..()
|
||||
icon_state = "c20r45-[round(ammo_count(),2)]"
|
||||
|
||||
obj/item/ammo_box/magazine/tommygunm45
|
||||
name = "drum magazine (.45)"
|
||||
obj/item/ammo_box/magazine/tommygunm9mm
|
||||
name = "drum magazine (9mm)"
|
||||
icon_state = "drum45"
|
||||
ammo_type = /obj/item/ammo_casing/c45
|
||||
caliber = ".45"
|
||||
ammo_type = /obj/item/ammo_casing/c9mm
|
||||
caliber = "9mm"
|
||||
max_ammo = 50
|
||||
|
||||
/obj/item/ammo_box/magazine/m50
|
||||
|
||||
@@ -231,13 +231,13 @@
|
||||
|
||||
/obj/item/weapon/gun/projectile/automatic/tommygun
|
||||
name = "thompson SMG"
|
||||
desc = "A genuine 'Chicago Typewriter'."
|
||||
desc = "Based on the classic 'Chicago Typewriter'."
|
||||
icon_state = "tommygun"
|
||||
item_state = "shotgun"
|
||||
w_class = 5
|
||||
slot_flags = 0
|
||||
origin_tech = "combat=5;materials=1;syndicate=2"
|
||||
mag_type = /obj/item/ammo_box/magazine/tommygunm45
|
||||
mag_type = /obj/item/ammo_box/magazine/tommygunm9mm
|
||||
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
|
||||
can_suppress = 0
|
||||
burst_size = 4
|
||||
|
||||
Reference in New Issue
Block a user