Skip to content

Commit

Permalink
Removes duplicate
Browse files Browse the repository at this point in the history
Accidentally made two Dealers with the last one, this is to fix it.
  • Loading branch information
X3ros committed Aug 18, 2024
1 parent b9653e2 commit acb472c
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 118 deletions.
2 changes: 1 addition & 1 deletion code/datums/abnormality/_ego_datum/teth.dm
Original file line number Diff line number Diff line change
Expand Up @@ -338,4 +338,4 @@

/datum/ego_datum/armor/luckdraw
item_path = /obj/item/clothing/suit/armor/ego_gear/teth/luckdraw
cost = 20
cost = 20
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,4 @@
newchance = 20
coin_status = FALSE
has_flipped = FALSE
return chance + newchance
return chance + newchance
108 changes: 0 additions & 108 deletions code/modules/mob/living/simple_animal/abnormality/teth/sixshotsharp.dm

This file was deleted.

6 changes: 3 additions & 3 deletions code/modules/paperwork/records/info/teth.dm
Original file line number Diff line number Diff line change
Expand Up @@ -369,9 +369,9 @@
"When the Qliphoth Counter reached zero, the physical condition of the abnormality improved significantly.",
"After its condition improves beyond a certain point, the abnormality will breach containment and travel through the facility on a horizontal path, dealing massive WHITE damage to everything it impacts.")

//Six-Shot Sharper
/obj/item/paper/fluff/info/teth/sixshotsharp
abno_type = /mob/living/simple_animal/hostile/abnormality/sixshotsharp
//Dealer of the Damned
/obj/item/paper/fluff/info/teth/dealerdamned
abno_type = /mob/living/simple_animal/hostile/abnormality/dealerdamned
abno_code = "T-01-72"
abno_info = list(
"When Agent Jamie poked T-01-72, the abnormality took some of Agent Jamie's health as a wager for a coin flip. When the coin landed heads, Jamie's health was refunded and the next work had a higher success rate. When the coin landed tails, nothing happened.",
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/ego_gun/he.dm
Original file line number Diff line number Diff line change
Expand Up @@ -329,4 +329,4 @@
to_chat(user,span_warning("You cannot reload this gun without an empty cylinder!"))
return
ammo_type = pick(ammotypes)
..()
..()
2 changes: 1 addition & 1 deletion code/modules/projectiles/projectile/ego_bullets/teth.dm
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,4 @@
projectile_piercing = PASSMOB
speed = 0.45
range = 14
hit_nondense_targets = TRUE
hit_nondense_targets = TRUE
2 changes: 1 addition & 1 deletion code/modules/projectiles/projectile/ego_bullets/waw.dm
Original file line number Diff line number Diff line change
Expand Up @@ -344,4 +344,4 @@
/obj/projectile/ego_bullet/ego_supershotgun
name = "super shotgun"
damage = 10
damage_type = RED_DAMAGE
damage_type = RED_DAMAGE
2 changes: 1 addition & 1 deletion code/modules/projectiles/projectile/ego_bullets/zayin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@

/obj/projectile/ego_bullet/ego_dud/Initialize()
qdel(src)
..()
..()
1 change: 0 additions & 1 deletion lobotomy-corp13.dme
Original file line number Diff line number Diff line change
Expand Up @@ -2916,7 +2916,6 @@
#include "code\modules\mob\living\simple_animal\abnormality\teth\scorched_girl.dm"
#include "code\modules\mob\living\simple_animal\abnormality\teth\shy_look.dm"
#include "code\modules\mob\living\simple_animal\abnormality\teth\simple_smile.dm"
#include "code\modules\mob\living\simple_animal\abnormality\teth\sixshotsharp.dm"
#include "code\modules\mob\living\simple_animal\abnormality\teth\skin_prophet.dm"
#include "code\modules\mob\living\simple_animal\abnormality\teth\so_that_no_cry.dm"
#include "code\modules\mob\living\simple_animal\abnormality\teth\someonesportrait.dm"
Expand Down

0 comments on commit acb472c

Please sign in to comment.