cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-19 02:52:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	README.md
#	code/game/jobs/job/job.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/carbon/human/npcs.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/Academy.dmm
#	maps/RandomZLevels/beach.dmm
#	maps/RandomZLevels/blackmarketpackers.dmm
#	maps/RandomZLevels/challenge.dmm
#	maps/RandomZLevels/example.dmm
#	maps/RandomZLevels/jungle.dmm
#	maps/RandomZLevels/listeningpost.dmm
#	maps/RandomZLevels/spacebattle.dmm
#	maps/RandomZLevels/stationCollision.dmm
#	maps/RandomZLevels/wildwest.dmm
#	maps/RandomZLevels/zresearchlabs.dmm
#	maps/northern_star/polaris-1.dmm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
#	maps/submaps/surface_submaps/plains/Boathouse.dmm
#	maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
#	maps/submaps/surface_submaps/wilderness/Boombase.dmm
#	maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
#	maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
#	maps/submaps/surface_submaps/wilderness/Drugden.dmm
#	maps/submaps/surface_submaps/wilderness/Rockybase.dmm
#	maps/submaps/surface_submaps/wilderness/Shack1.dmm
#	maps/virgo/virgo-6.dmm
#	vorestation.dme
This commit is contained in:
Arokha Sieyes
2018-04-25 17:23:33 -04:00
parent 4d1f216c85 a849010ab1
commit 6c686e6a2f
123 changed files with 13004 additions and 82912 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/locker_painter.dm
+19
View File
@@ -58,11 +58,30 @@
"Administrator" = list("open" = "capsecureopen", "closed" = "capsecure", "locked" = "capsecure1", "broken" = "capsecurebroken", "off" = "capsecureoff")
)
var/forbidden_types = list(
/obj/structure/closet/alien,
/obj/structure/closet/body_bag,
/obj/structure/closet/cabinet,
/obj/structure/closet/crate,
/obj/structure/closet/coffin,
/obj/structure/closet/fireaxecabinet,
/obj/structure/closet/hydrant,
/obj/structure/closet/medical_wall,
/obj/structure/closet/statue,
/obj/structure/closet/walllocker
)
/obj/item/device/closet_painter/afterattack(atom/A, var/mob/user, proximity)
if(!proximity)
return
var/non_closet = 0
if(!istype(A,/obj/structure/closet))
non_closet = 1
for(var/ctype in forbidden_types)
if(istype(A,ctype))
non_closet = 1
if(non_closet)
user << "<span class='warning'>\The [src] can only be used on closets.</span>"
return
code/game/objects/items/toys.dm
+12 -2
View File
@@ -768,7 +768,7 @@
name = "space carp plushie"
desc = "An adorable stuffed toy that resembles a space carp."
icon = 'icons/obj/toy.dmi'
icon_state = "plushie/carp"
icon_state = "basecarp"
attack_verb = list("bitten", "eaten", "fin slapped")
var/bitesound = 'sound/weapons/bite.ogg'
@@ -787,39 +787,49 @@
name = "Random Carp Plushie"
desc = "This is a random plushie"
icon = 'icons/obj/toy.dmi'
icon_state = "plushie/carp"
icon_state = "basecarp"
/obj/random/carp_plushie/item_to_spawn()
return pick(typesof(/obj/item/toy/plushie/carp)) //can pick any carp plushie, even the original.
/obj/item/toy/plushie/carp/ice
name = "ice carp plushie"
icon_state = "icecarp"
/obj/item/toy/plushie/carp/silent
name = "monochrome carp plushie"
icon_state = "silentcarp"
/obj/item/toy/plushie/carp/electric
name = "electric carp plushie"
icon_state = "electriccarp"
/obj/item/toy/plushie/carp/gold
name = "golden carp plushie"
icon_state = "goldcarp"
/obj/item/toy/plushie/carp/toxin
name = "toxic carp plushie"
icon_state = "toxincarp"
/obj/item/toy/plushie/carp/dragon
name = "dragon carp plushie"
icon_state = "dragoncarp"
/obj/item/toy/plushie/carp/pink
name = "pink carp plushie"
icon_state = "pinkcarp"
/obj/item/toy/plushie/carp/candy
name = "candy carp plushie"
icon_state = "candycarp"
/obj/item/toy/plushie/carp/nebula
name = "nebula carp plushie"
icon_state = "nebulacarp"
/obj/item/toy/plushie/carp/void
name = "void carp plushie"
icon_state = "voidcarp"
//Large plushies.
code/game/objects/items/weapons/implants/implantcircuits.dm
+2 -2
View File
@@ -29,7 +29,7 @@
<b>Function:</b> Contains no innate functions until other components are added.<BR>
<b>Special Features:</b>
<i>Modular Circuitry</i>- Can be loaded with specific modular circuitry in order to fulfill a wide possibility of functions.<BR>
<b>Integrity:</b> Implant is not shielded from electromagnetic interferance, otherwise it is independant of subject's status."}
<b>Integrity:</b> Implant is not shielded from electromagnetic interference, otherwise it is independent of subject's status."}
return dat
/obj/item/weapon/implant/integrated_circuit/emp_act(severity)
@@ -45,4 +45,4 @@
..()
/obj/item/weapon/implant/integrated_circuit/attack_self(mob/user)
IC.attack_self(user)
IC.attack_self(user)
code/game/objects/items/weapons/storage/bags.dm
+1
View File
@@ -275,6 +275,7 @@
var/stacksize = min(S.amount,N.max_amount)
N.amount = stacksize
S.amount -= stacksize
N.update_icon()
if(!S.amount)
qdel(S) // todo: there's probably something missing here
orient2hud(usr)