diff --git a/code/game/gamemodes/gang/gang_datum.dm b/code/game/gamemodes/gang/gang_datum.dm index 2acf7856acc..d5d431073b9 100644 --- a/code/game/gamemodes/gang/gang_datum.dm +++ b/code/game/gamemodes/gang/gang_datum.dm @@ -42,8 +42,6 @@ name = (gangname ? gangname : pick(gang_name_pool)) gang_name_pool -= name - if(name == "Sleeping Carp") - fighting_style = "martial" ganghud = new() log_game("The [name] Gang has been created. Their gang color is [color].") diff --git a/code/game/gamemodes/gang/recaller.dm b/code/game/gamemodes/gang/recaller.dm index 42e35796611..35860748dfa 100644 --- a/code/game/gamemodes/gang/recaller.dm +++ b/code/game/gamemodes/gang/recaller.dm @@ -107,30 +107,6 @@ dat += "
" - ////////////////// - // MARTIAL ARTS // - ////////////////// - - else if(gang.fighting_style == "martial") - dat += "(10 Influence) " - if(points >= 10) - dat += "Bo Staff
" - else - dat += "Bo Staff
" - - dat += "(20 Influence) " - if(points >= 20) - dat += "Wrestling Belt
" - else - dat += "Wrestling Belt
" - - dat += "(30 Influence) " - if(points >= 30) - dat += "Sleeping Carp Scroll (one-use)
" - else - dat += "Sleeping Carp Scroll (one-use)
" - dat += "
" - //////////////////////// // STANDARD EQUIPMENT // //////////////////////// diff --git a/code/game/objects/items/weapons/pneumaticCannon.dm b/code/game/objects/items/weapons/pneumaticCannon.dm index 7c4e0dcce55..a3fee8b4079 100644 --- a/code/game/objects/items/weapons/pneumaticCannon.dm +++ b/code/game/objects/items/weapons/pneumaticCannon.dm @@ -88,9 +88,6 @@ if(!istype(user) && !target) return var/discharge = 0 - if(is_in_gang(user, "Sleeping Carp")) - user << "Use of ranged weaponry would bring dishonor to the clan." - return if(!loadedItems || !loadedWeightClass) user << "\The [src] has nothing loaded." return