Skip to content

Commit

Permalink
Merge pull request #3 from animusdev/master
Browse files Browse the repository at this point in the history
Мерж
  • Loading branch information
kreeperHLC authored Jan 24, 2018
2 parents d7c3718 + 93725ff commit adbcc33
Show file tree
Hide file tree
Showing 21 changed files with 8,779 additions and 8,659 deletions.
14 changes: 14 additions & 0 deletions code/modules/client/preference_setup/loadout/head.dm
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,20 @@
"white" = /obj/item/clothing/head/soft/mime
)

/datum/gear/head/fitnessheadband
display_name = "fitness headband"
path = /obj/item/clothing/head/whitefitnessheadband
options = list(
"grey" = /obj/item/clothing/head/greyfitnessheadband,
"blue" = /obj/item/clothing/head/bluefitnessheadband,
"green" = /obj/item/clothing/head/greenfitnessheadband,
"dark green" = /obj/item/clothing/head/darkgreenfitnessheadband,
"orange" = /obj/item/clothing/head/orangefitnessheadband,
"purple" = /obj/item/clothing/head/purplefitnessheadband,
"rainbow" = /obj/item/clothing/head/rainbowfitnessheadband,
"yellow" = /obj/item/clothing/head/yellowfitnessheadband
)

/datum/gear/head/hairflower
display_name = "hair flower pin, red"
path = /obj/item/clothing/head/hairflower
Expand Down
5 changes: 5 additions & 0 deletions code/modules/client/preference_setup/loadout/mask.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
slot = slot_wear_mask
sort_category = "Masks and Facewear"

/datum/gear/mask/whitebalaclava
display_name = "balaclava, white"
path = /obj/item/clothing/mask/whitebalaclava
cost = 3

/datum/gear/mask/gold
display_name = "bandana, gold"
path = /obj/item/clothing/mask/bandana/gold
Expand Down
2 changes: 2 additions & 0 deletions code/modules/client/preference_setup/loadout/suit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@
options = list(
"grey" = /obj/item/clothing/suit/storage/flannel,
"red" = /obj/item/clothing/suit/storage/flannel/red,
"yellow" = /obj/item/clothing/suit/storage/flannel/yellow,
"armagan" = /obj/item/clothing/suit/storage/flannel/armagan,
"aqua" = /obj/item/clothing/suit/storage/flannel/aqua
)

Expand Down
54 changes: 54 additions & 0 deletions code/modules/clothing/head/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,60 @@
icon_state = "beret_white"
item_state = "beret_white"

/obj/item/clothing/head/greyfitnessheadband
name = "grey fitness headband"
desc = "You are the best."
icon_state = "headband_gry"
icon_state = "headband_gry"

/obj/item/clothing/head/whitefitnessheadband
name = "white fitness headband"
desc = "You are the best."
icon_state = "headband_whi"
item_state = "headband_whi"

/obj/item/clothing/head/orangefitnessheadband
name = "orange fitness headband"
desc = "You are the best."
icon_state = "headband_org"
item_state = "headband_org"

/obj/item/clothing/head/yellowfitnessheadband
name = "yellow fitness headband"
desc = "You are the best."
icon_state = "headband_yel"
item_state = "headband_yel"

/obj/item/clothing/head/greenfitnessheadband
name = "green fitness headband"
desc = "You are the best."
icon_state = "headband_grn"
item_state = "headband_grn"

/obj/item/clothing/head/darkgreenfitnessheadband
name = "dark green fitness headband"
desc = "You are the best."
icon_state = "headband_dgn"
item_state = "headband_dgn"

/obj/item/clothing/head/bluefitnessheadband
name = "blue fitness headband"
desc = "You are the best."
icon_state = "headband_blu"
item_state = "headband_blu"

/obj/item/clothing/head/purplefitnessheadband
name = "purple fitness headband"
desc = "You are the best."
icon_state = "headband_prl"
item_state = "headband_prl"

/obj/item/clothing/head/rainbowfitnessheadband
name = "rainbow fitness headband"
desc = "You are the stoned one."
icon_state = "headband_rnb"
item_state = "headband_rnb"

/obj/item/clothing/head/beret/army/solar
name = "Armored army beret"
desc = "That's the khaki-colored beret. Has a NTCI insignia on it"
Expand Down
8 changes: 8 additions & 0 deletions code/modules/clothing/masks/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,14 @@

adjust_mask(usr)

/obj/item/clothing/mask/whitebalaclava
name = "white balaclava"
desc = "This makes you sacrifice for your virtues."
icon_state = "fedayeenclava"
item_state = "fedayeenclava"
w_class = ITEM_SIZE_SMALL
body_parts_covered = FACE

/obj/item/clothing/mask/fakemoustache
name = "fake moustache"
desc = "Warning: moustache is fake."
Expand Down
12 changes: 11 additions & 1 deletion code/modules/clothing/suits/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -484,4 +484,14 @@
/obj/item/clothing/suit/storage/flannel/aqua
desc = "A comfy, aqua flannel shirt. Unleash your inner hipster."
icon_state = "flannel_aqua"
item_state = "b_suit"
item_state = "b_suit"

/obj/item/clothing/suit/storage/flannel/yellow
desc = "A comfy, yellow flannel shirt. Unleash your inner hipster."
icon_state = "flannel_yel"
item_state = "b_suit"

/obj/item/clothing/suit/storage/flannel/armagan
desc = "A comfy, Armagan flannel shirt. It's almost harvesting season."
icon_state = "flannel_trk"
item_state = "b_suit"
16 changes: 11 additions & 5 deletions code/modules/holodeck/HolodeckObjects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -130,20 +130,22 @@

/obj/item/weapon/holo/esword
desc = "May the force be within you. Sorta."
icon = 'icons/obj/weapons.dmi'
icon_state = "sword0"
force = 3.0
throw_speed = 1
throw_range = 5
throwforce = 0
w_class = ITEM_SIZE_SMALL
sprite_group = SPRITE_MELEE
flags = NOBLOODY
var/active = 0
var/item_color

/obj/item/weapon/holo/esword/green
/obj/item/weapon/holo/esword/green/New()
item_color = "green"

/obj/item/weapon/holo/esword/red
/obj/item/weapon/holo/esword/red/New()
item_color = "red"

/obj/item/weapon/holo/esword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/attack_text = "the attack")
Expand Down Expand Up @@ -177,14 +179,18 @@
active = !active
if (active)
force = 30
icon = 'icons/obj/weapons.dmi'
icon_state = "sword[item_color]"
sprite_group = SPRITE_MELEE
w_class = ITEM_SIZE_HUGE
playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
user << SPAN_NOTE("[src] is now active.")
else
force = 3
icon = 'icons/obj/weapons.dmi'
icon_state = "sword0"
w_class = ITEM_SIZE_SMALL
sprite_group = SPRITE_MELEE
playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
user << SPAN_NOTE("[src] can now be concealed.")

Expand Down Expand Up @@ -270,9 +276,9 @@

/obj/machinery/readybutton/attack_hand(mob/user as mob)

if(user.stat || stat & (NOPOWER|BROKEN))
user << "This device is not powered."
return
// if(user.stat || stat & (NOPOWER|BROKEN)) ================> Holodeck areas don't have power
// user << "This device is not powered."
// return

if(!user.IsAdvancedToolUser())
return 0
Expand Down
17 changes: 10 additions & 7 deletions code/modules/paperwork/photography.dm
Original file line number Diff line number Diff line change
Expand Up @@ -158,13 +158,16 @@ var/global/photo_count = 0
var/icon_off = "camera_off"
var/size = 3

/obj/item/device/camera/verb/change_size()
set name = "Set Photo Focus"
set category = "Object"
var/nsize = input("Photo Size","Pick a size of resulting photo.") as null|anything in list(1,3,5,7)
if(nsize)
size = nsize
usr << SPAN_NOTE("Camera will now take [size]x[size] photos.")
////NO LAGS

/////obj/item/device/camera/verb/change_size()
//// set name = "Set Photo Focus"
//// set category = "Object"
//// var/nsize = input("Photo Size","Pick a size of resulting photo.") as null|anything in list(1,3,5,7)
//// if(nsize)
//// size = nsize
//// usr << SPAN_NOTE("Camera will now take [size]x[size] photos.")


/obj/item/device/camera/attack(mob/living/carbon/human/M as mob, mob/user as mob)
return
Expand Down
2 changes: 2 additions & 0 deletions code/modules/projectiles/guns/energy/nuclear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
/obj/item/weapon/gun/energy/gun/nuclear
name = "advanced energy gun"
desc = "An energy gun with an experimental miniaturized reactor."
icon = 'icons/obj/gun.dmi'
sprite_group = SPRITE_GUNS
icon_state = "nucgunstun"
projectile_type = /obj/item/projectile/beam/stun
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_POWER = 3)
Expand Down
11 changes: 11 additions & 0 deletions html/changelog.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,17 @@
</td></tr>
<tr><td>
<div class="commit sansserif">
<h2 class="date">24.01.2018</h2>
<h3 class="author">BigRage updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Добавлены новые камеры.</li>
<li class="rscadd">Добавлены новые цвета Фланели от Nyancom</li>
<li class="rscadd">Добавлены новые повязки на голову. Искать в loadout - fitnessheadband. Фитнес в наших сердцах!</li>
<li class="rscadd">Добавлена белая балаклава в loadout.</li>
<li class="bugfix">Камера больше не вызывает лаги.</li>
<li class="bugfix">Пофикшен спрайт лазерного меча в голодеке. Теперь он отображается в руке.</li>
<li class="bugfix">Пофикшен спрайт усовершенствованной энергетической пушки. Теперь она отображается в руке.</li>
</ul>
<h2 class="date">21.01.2018</h2>
<h3 class="author">BigRage updated:</h3>
<ul class="changes bgimages16">
Expand Down
Binary file modified icons/inv_slots/glasses/icon.dmi
Binary file not shown.
Binary file modified icons/inv_slots/glasses/mob.dmi
Binary file not shown.
Binary file modified icons/inv_slots/hats/icon.dmi
Binary file not shown.
Binary file modified icons/inv_slots/hats/mob.dmi
Binary file not shown.
Binary file modified icons/inv_slots/masks/icon.dmi
Binary file not shown.
Binary file modified icons/inv_slots/masks/mob.dmi
Binary file not shown.
Binary file modified icons/inv_slots/suits/icon.dmi
Binary file not shown.
Binary file modified icons/inv_slots/suits/mob.dmi
Binary file not shown.
Binary file modified icons/inv_slots/suits/mob_slim.dmi
Binary file not shown.
Loading

0 comments on commit adbcc33

Please sign in to comment.