cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3036 from VOREStation/aro-3010

Browse Source 
Fixes NSFW mode selection
This commit is contained in:
Aronai Sieyes
2018-02-15 18:00:26 -06:00
committed by GitHub
parent 812d459bd8 2dffd17c39
commit 702997ffba
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/vore/fluffstuff/guns/nsfw.dm
View File

@@ -218,7 +218,7 @@
// The Casing // // The Casing //
/obj/item/ammo_casing/nsfw_batt /obj/item/ammo_casing/nsfw_batt
name = "\'NSFW\' microbattery - LETHAL" name = "\'NSFW\' microbattery - UNKNOWN"
desc = "A miniature battery for an energy weapon." desc = "A miniature battery for an energy weapon."
icon = 'icons/obj/ammo_vr.dmi' icon = 'icons/obj/ammo_vr.dmi'
icon_state = "nsfw_batt" icon_state = "nsfw_batt"
@@ -230,8 +230,8 @@
leaves_residue = 0 leaves_residue = 0
caliber = "nsfw" caliber = "nsfw"
var/shots_left = 4 var/shots_left = 4
var/type_color = "#bf3d3d" var/type_color = null
var/type_name = "<span style='color:#bf3d3d;font-weight:bold;'>LETHAL</span>" var/type_name = null
projectile_type = /obj/item/projectile/beam projectile_type = /obj/item/projectile/beam
/obj/item/ammo_casing/nsfw_batt/New() /obj/item/ammo_casing/nsfw_batt/New()
@@ -253,6 +253,12 @@
shots_left-- shots_left--
// Specific batteries // // Specific batteries //
/obj/item/ammo_casing/nsfw_batt/lethal
name = "\'NSFW\' microbattery - LETHAL"
type_color = "#bf3d3d"
type_name = "<span style='color:#bf3d3d;font-weight:bold;'>LETHAL</span>"
projectile_type = /obj/item/projectile/beam
/obj/item/ammo_casing/nsfw_batt/stun /obj/item/ammo_casing/nsfw_batt/stun
name = "\'NSFW\' microbattery - STUN" name = "\'NSFW\' microbattery - STUN"
type_color = "#0f81bc" type_color = "#0f81bc"
@@ -377,7 +383,7 @@
..() ..()
new /obj/item/weapon/gun/projectile/nsfw(src) new /obj/item/weapon/gun/projectile/nsfw(src)
new /obj/item/ammo_magazine/nsfw_mag(src) new /obj/item/ammo_magazine/nsfw_mag(src)
for(var/path in typesof(/obj/item/ammo_casing/nsfw_batt)) for(var/path in subtypesof(/obj/item/ammo_casing/nsfw_batt))
new path(src) new path(src)
/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hos /obj/item/weapon/storage/secure/briefcase/nsfw_pack_hos
@@ -389,8 +395,8 @@
..() ..()
new /obj/item/weapon/gun/projectile/nsfw(src) new /obj/item/weapon/gun/projectile/nsfw(src)
new /obj/item/ammo_magazine/nsfw_mag(src) new /obj/item/ammo_magazine/nsfw_mag(src)
new /obj/item/ammo_casing/nsfw_batt(src) new /obj/item/ammo_casing/nsfw_batt/lethal(src)
new /obj/item/ammo_casing/nsfw_batt(src) new /obj/item/ammo_casing/nsfw_batt/lethal(src)
new /obj/item/ammo_casing/nsfw_batt/stun(src) new /obj/item/ammo_casing/nsfw_batt/stun(src)
new /obj/item/ammo_casing/nsfw_batt/stun(src) new /obj/item/ammo_casing/nsfw_batt/stun(src)
new /obj/item/ammo_casing/nsfw_batt/net(src) new /obj/item/ammo_casing/nsfw_batt/net(src)