cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-26 05:26:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

Browse Source 
# Conflicts:
#	code/ATMOSPHERICS/pipes.dm
#	code/game/turfs/flooring/flooring.dm
#	code/modules/clothing/clothing_accessories.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	html/changelogs/.all_changelog.yml
This commit is contained in:
Arokha Sieyes
2018-02-27 21:27:35 -05:00
committed by Leshana
parent d9db705a00 8c9c99f817
commit 3fe17274d2
66 changed files with 1764 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/robot/robot_upgrades.dm
+2
View File
@@ -213,8 +213,10 @@
R.add_language(LANGUAGE_UNATHI, 1)
R.add_language(LANGUAGE_SIIK, 1)
R.add_language(LANGUAGE_SKRELLIAN, 1)
R.add_language(LANGUAGE_SKRELLIANFAR, 0)
R.add_language(LANGUAGE_GUTTER, 1)
R.add_language(LANGUAGE_SCHECHI, 1)
R.add_language(LANGUAGE_ROOTLOCAL, 1)
R.add_language(LANGUAGE_TERMINUS, 1)
return 1
code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm
+1 -1
View File
@@ -10,7 +10,7 @@
/obj/fiftyspawner/wood/sif
name = "stack of alien wood"
type_to_spawn = /obj/item/stack/tile/sifwood
type_to_spawn = /obj/item/stack/tile/wood/sif
/obj/fiftyspawner/carpet
name = "stack of carpet"
code/game/objects/items/stacks/tiles/tile_types.dm
+1 -16
View File
@@ -37,9 +37,6 @@
flags = 0
origin_tech = list(TECH_BIO = 1)
no_variants = FALSE
/obj/item/stack/tile/grass/fifty
amount = 50
/*
* Wood
*/
@@ -55,23 +52,11 @@
flags = 0
no_variants = FALSE
/obj/item/stack/tile/sifwood
/obj/item/stack/tile/wood/sif
name = "alien wood tile"
singular_name = "alien wood tile"
desc = "An easy to fit wooden floor tile. It's blue!"
icon_state = "tile-sifwood"
force = 1.0
throwforce = 1.0
throw_speed = 5
throw_range = 20
flags = 0
no_variants = FALSE
/obj/item/stack/tile/wood/fifty
amount = 50
/obj/item/stack/tile/sifwood/fifty
amount = 50
/obj/item/stack/tile/wood/cyborg
name = "wood floor tile synthesizer"
code/game/objects/items/weapons/storage/storage.dm
+1 -3
View File
@@ -674,7 +674,6 @@
/*
* Trinket Box - READDING SOON
*/
/*
/obj/item/weapon/storage/trinketbox
name = "trinket box"
desc = "A box that can hold small trinkets, such as a ring."
@@ -724,5 +723,4 @@
..()
if(open && contents.len)
var/display_item = contents[1]
to_chat(user, "<span class='notice'>\The [src] contains \the [display_item]!</span>")
*/
to_chat(user, "<span class='notice'>\The [src] contains \the [display_item]!</span>")
code/game/objects/items/weapons/syndie.dm
+4 -4
View File
@@ -13,9 +13,9 @@
desc = "A small wrapped package."
w_class = ITEMSIZE_NORMAL
var/devastate = 0
var/heavy_impact = 1
var/light_impact = 2
var/devastate = 1
var/heavy_impact = 2
var/light_impact = 4
var/flash_range = 5
var/size = "small" /*Used for the icon, this one will make c-4small_0 for the off state.*/
@@ -24,7 +24,7 @@
item_state = "radio"
desc = "A mysterious package, it's quite heavy."
devastate = 1
heavy_impact = 2
heavy_impact = 3
light_impact = 5
flash_range = 7
size = "large"